Once you have the switches out you could always put some silicone conductive grease on the connectors to make sure you have good contact and aren't getting moisture in them.

"A job will always take TWICE the time you think you need."