Ray-O-Vac 2AA 3 Watt tailcap help

I have been playing around with this interesting cheap little light I got at WalMart while looking for that 4Watt 2xC flashlight. The operation of the flashlight is horrible! You must turn the tail cap inorder to make it turn on OR hold the pushbutton on the bottom in.

Does anyone have an idea on what replacement clickie would work or could someone suggest something (other than getting a nice Surefire!! (that's on the list for Christmas thank you)). The total inside diameter is slightly under 3/4 of an inch.

I have a Bridgeport and a lathe, so I can do limited modding. I am not a machinist....but I do have one at my disposal if neccessary!!

I would appreciate anyones help or comments.

Bob E.

I'm surprised you've never used a momentary twisty before (the type of switch that light uses). I've tried modding one of my Rayovac Highbeams with a clickie. It worked, but the results weren't satisfactory to me.