Well anyway, I ended up taking the switch out and cleaning the contacts with isopropyl alcohol and reapplied some dielectric grease. Works like a charm now