I should probably update this one; replacing the switch worked a treat... for about 12 months, before it failed again. Hopefully the new one will last longer. The original one used screw terminals, but I was unable to find one locally with those, so I switched to spade terminals and crimped connectors onto the wires, which works, but are slightly longer than the original setup, so it's a bit harder to refit the rubber boot.
Cheers,
Terry