Yeah, I’ve had some issues with that too. This is the switch I used for this light: http://www.newark.com/c-k-components/k12c12-5n/switch-1mm-travel-2-5n-ip67-seal/dp/58T4766
For smaller lights I did this: Mod: My take on the convoy S series with side switch mod.
Check the last photos, I ditched that switch that was taped to the outside.
I would definitely like a copper pill for this one, but the light I have is quite old and I’ve read here that the newer ones have declined in quality. Someone would have to confirm though. If the new ones suck it might be a waste of time making a copper pill for it.
I’ll have to make it a habit now, I’m hooked! 
I had one shared before, but changed the design just a little later on… I’ve now shared it again: https://oshpark.com/shared_projects/gqQMuyMr