John,
your point about the solder is a good one.
I own a dremel - ( best electric tool you could buy).
I use the dremel to lap the contacts inside the switch & clean all the 1/4 terminals, and just to ensure the suface is at the right hieght I add a lick of solder. Ok, it might last 2 or 3 years, then wear down, but hey, it takes 2 minutes to pull the switch out and rip the top off!
As for wiring the connectors back, the colour coding is easy to remember.
Your referance to voltage drop - yes - dead right - thats why I advocate the use of relays - ie, the high beam headlights - bung a 30 amp relay on em and stand back! Its that easy. All this waffle about xeon bulbs and so on... if anyone needs proof - hook up a headlight direct to the battery, at night and just look at the differance!
A blind man could tell,
[8D][8D][8D][8D][8D][8D]