I'll suggest using a good electrical contact cleaner, like CRC, instead of WD-40, to clean switch contacts.

WD-40 does a great job of displacing water, its original function, and loosening rusted things, but it is not a good long-term lubricant and not a good contact cleaner.

Best Regards,
Jim