Having not followed this thread, I am a little out of the loop. But in terms of the horrid plastic connector, a good replacement is a junction block off of a chevy truck or S10. Simple, solid, durable. Unless you are staying perfectly stock... Picture: http://www.unm.edu/~geoffj/images/Wiring/Distribution-Block.JPG