Use a Lumapower body and swap heads. It's the ec21 I believe, it's an aaa light with a clip and clicky. About 25 bucks but it solves your clip problem, and makes it a clicky. Solving another issue if yours flickers to high and almost skips low. It's a very easy mod, just need a tiny bit of aluminum foil to make the body contact the head circuit. Sounds ghetto but is my most used light. I have a thread with pictures around here somewhere
