I ended up replacing my switch too.

A good (and significantly cheaper) fix is to simply install a momentary switch as Joel did. I did that as an interim fix while waiting for the replacement switch from Headhunter.