Today I took the switch off, cleaned the plug and socket, bent the spring that operates the switch out a bit, checked it worked and then re-assembled it. I don't know how long it will last, you can't take the actual switch apart to clean the switch contacts.
P.S. Yesterday the odometer clicked...