In the meantime I've been refurbishing the handle bar switches and mounting my new short bars. I disassembled the switches, cleaned all the contact surfaces and redid a few bad solder joints. My hi/lo switch was all corroded, had a broken solder joint, and was missing a spring. Its good as new now with very low resistance measured through the switch.

P1060811 by flyin_, on Flickr

P1060809 by flyin_, on Flickr

P1060824 by flyin_, on Flickr

P1060826 by flyin_, on Flickr
Hopefully I'll get my new bronze bushing installed in the right side cover tonight...