I have a couple of sets of these lamps with new switch housings.
The only difference between the two is the electric plug connections changed but an easy fix. I think I have both types.
The factory kits are no longer available but you may find new old stock somewhere.
One has repaired scrapes to chrome but functional and really need to be re-painted black. The other set is unmarked chrome. The switches are just standard toggle switches that fit into the switch housings which also have a switch for heated grips as well. See #13 below is same as #14 above.
[ATTACH=full]99907[/ATTACH]