I see that you have replaced with Needswings plugs and wires. Did you do it yourself or have a shop do it? I'm asking because I have the special tools for that and could let you borrow them if you don't already have. I'll be in your area this weekend(I'm a new grandpa, and will be down in Brentwood for a visit). But hopefully the clean/spray procedure you're going to do takes care of the issue. PM me if you find the need.