I had similar problems and changed my setup to use long button tactile switches. You need to reverse the logic in the firmware.
The tactile worked so good, I now use them for the Z probe too.Very accurate, cheap and small size.
Genie MagikMaker 3D Printer - Reg's Genie Hotend - My_i3s - SmartRap 3D Printer variations
Made in South Australia
"Experience is the mother of all knowledge." --Leonardo da Vinci