I used an Accel switch along with a Russell Bango bolt adapter that has a port for a switch. After seeing the inside of the switch, I wanted to get away from the 2 in 1 combination switch Harley uses because I did not want to go through this again in another year or until HD gets it right. Both parts I found in a J& P catalog. The Accel Switch was part #240-693 & the Russell adapter was #240-723. The fit was perfect and no modification to the electrical wires was needed. It was plug and Play. I will now see what the service life on this new switch is compared to the HD.
If you want to test your current switch, place an ohm meter across it and put your meter in the 20 meg/ohm scale. The scale MUST be in the highest range. If you read anything other than infinity (while having NO foot pressure on switch), your switch contacts have brake fluid on them and it is only a matter of time. Mine read 2 meg ohms when OFF which is a dead give-away something is wrong inside the switch. In actual use, the switch worked correctly "most" of the time,,but as you can see it was toast inside.