@Viper, a little earlier in the thread I answered the same question, with links to a video, and how to and an explanation of what is happening. Simply put, the o-ring is not sealing properly, probably because of the threading. I addressed it by adding a second one and a dab of silicon.
Crypto, check the solder on the edge of the PCB that grounds to the body when you insert the switch. Check the 5 solder joints under a magnifying glass and light, look for bad soldering or cracks there. Verify no shorts between positive pole and body also, just to be sure... But chances are, it is not making contact to the body like it needs. Also, do NOT over tighten the retaining nut when putting it back together.
I ordered a new switch from Pailpoe and got a hold of him at Vapor Wall, because mine had completely failed. He sold me a new switch, but it was very reasonable, and honestly think I only paid for shipping???
I noticed the ground "ring" on the new switch PCB was built up with a nice "raised" solder line on the PCB that grounds to the body, opposite from the side with micro switch. I also noticed the same thing on the new 2.1 that my friend received a couple weeks ago, because we took it apart to add another o-ring, stop the button rattle, and that is when we found the epoxy sealer cracked on the switch

But his is working well.