If you can't find one, and don't mind spending a bit more, Kevin. I can offer many alternatives for a decent price and a little better quality. It seems I've become addicted to flashlights
You can start with this "drop-in"
http://www.lighthound.com/Solar-Forc...ge_p_3507.html
Then add this "host"
http://www.lighthound.com/Solar-Forc...es_p_3474.html
This is a "poor mans" Surefire that runs on AA batteries and gives you the option to upgrade easily and cheaply in the future. Trust me, they seem to come out with a new P-60 drop-in every month right now! This is also a three mode module! Just make sure if you get one for this host it's rated at .8v and up, not any higher or the AA's wont power it!
Brendon, I also used to love and Swear buy Surfire, I have a couple still, an E2W and a 9P, nice high quality lights. My problem with them, they are slow to make improvements, as in years behind the latest LED's (because they want to make sure they are working properly) and every year, or every other year at least, they up the prices of their light's 30%. Think I'm joking? Price some out now, then price them out next month after the price increase kicks in! The E2-AA is going to be $189 next month! Two mode, less output and run time than the setup I just showed to Kevin with two modes, and $189? AND it's not upgradeable without MAJOR work!
They've kinda lost their luster with me, I like the HDS lights and the Fenix lights, then the Solarforce hosts are C and P Surefire compatible, meaning the tailcap head, and bulb drop right in screw right on them. I just can't say they are worth what they are asking for them anymore!