This is what I did. Wise words.
Guys
While you are doing any re-wiring I would spend time putting in a couple of relays , one each for high and low beams, especially if you are adding spots to the high beam circuit.
This does 2 things , it takes most of the electrical loading off the switch, and preserves the contacts, and it ensures that you have full voltage at the lights and not way back down the wiring loom.
