Surefire's are over priced and I don't think are that great. I have a 6P that has the same problem, flashlight was pretty much $100 that uses two CR123 (1-2$ a piece) thats now nothing more than a paper weight. I've bought a Fenix light since, at half that cost, with more options and it has lasted longer and is cheaper to run than said flashlight. I would recommend the TK12 or if you want something cheaper the Fenix L2D.
