You should be able to tweak the contacts on the switch without replacing it. Clean up the contacts with some 1000 grit sand paper and put a light coat of dielectric grease on them. Tip….. test the switch before you install it and watch that little spring that can shoot across the room.
http://www.rattlebars.com/mtz/starter.html