Clickys are the main weak point of any light that has them, and most all lights use the same crappy chines made switches that are not made for the current that we put on them. there are high current switches(
http://www.candlep...hread.php?t=248609) made and they are VERY reliable, but they are made for surefire tall caps and i'm not sure if they fit in the fenix tall caps. OR you could mod the tall cap to be a twisty ,i have not played with a fenix before but you basically take out the guts of the cap, than put back in the retaining ring and hotglue a dime in the cap so that its electrically isolated from the cap itself, but makes contact with the battery and the bottom of the battery tube.
Hope everything works out for you.