Can I still use the original headlamp switch with my now 12 volt configuration? Or do they sell a repro switch for this purpose.
You can use the headlight switch. Since you changed to 12V, the switch will actually handle only about half the amperage it controlled on 6V.