Throwing new parts at a problem until it gets fixed can get expensive. There are less expensive ways to troubleshoot.
For example: turning the contact within the switch 180° may solve the problem. Of course, checking for a sloppy linkage would be the first order of business.