I'm a little obsessive about lights, steering, and brakes. The very best is just barely good enough when I'm betting my life of those systems working. I'd suggest installing a new headlight switch, a new dimmer switch, AND setting up the headlights to work off relays rather than running full current through two switches in series with each other. An added advantage will be brighter headlights, especially on a 6V system. A 60 amp capacity Bosch-type relay can be wired to default to low beams by flipping a simple toggle switch in case there's ever a failure of the main headlight switch/dimmer system. Sort of a belt and suspenders situation!
Jerry

"It is better to be silent and be thought a fool than to speak and eliminate all doubt!" - Abraham Lincoln
Cringe and wail in fear, Eloi- - - - -we Morlocks are on the hunt!
There is nothing noble in being superior to your fellow man; true nobility is being superior to your former self. - Ernest Hemingway
Love your enemies and drive 'em nuts!