Here is an "upgrade'" that you might consider - add a switch protector diode to the starter solenoid assembly. When the starter switch button is released there is a high induced voltage spike created within the solenoid's windings. The diode makes an easy path for electrical current to flow when this spike occurs. This reduces spark erosion on your starter switch thereby giving it a longer switch life.
Radio Shack sells inexpensive diodes. A 100 volt, 3 amp diode should work fine. Assuming you have a positive ground vehicle, connect the cathode side (the side marked with a white or silver band) to ground and connect the anode side (unmarked side) of the diode to the switch terminal.
These switch protecting diodes are commonly used on aircraft starter relays and master relays. They are used to protect the magneto/starter switch (very expensive) and the master switch.