I am a licensed, bonded, insured electrical contractor. Give me a call. I would be more than happy to swing by and take a look at it for you and give you my recomendations. I tried to figure out what you had thru the posts, but too much to read, better/easier if I looked at it in person.
Mike
(918) 693-4361
Mike
(918) 693-4361