Thanks, guys. I went ahead and bid on the switch. It's not like $20 will kill me. I would eventually like to get a replacement kill switch, but they'e either junk or NOS and $100. My kill switch broke so I fused the wires for now. I won't let my wife learn to ride until there's a kill switch there. I'm sure that my error on the headlight switch was with the contacts in the switch. I don't believe there is any contact now.