Hi Drew,
The switches were the same for S1 & 2. The only difference was the translucent green knob on the later V8's and TC's, but these just pull off, so you can refit the black 'toggle' part from the old switch if you still have it. Ebay is probably your best bet. I saw some individual switches without any knobs on there a few days ago.
Michael