I'm doing research for my first light. The Super Drive does not seem to be regulated, so the intensity drops off over time. That's what killed it for me. You could look at XM-L flashlights if you want easily replaceable batteries.

If the MagicShine is still working, you could just get a new battery for it. You might be able to do an exchange? check geomangear, I believe he's been sending out new batteries using good cells. If the lighthead fails, you can just buy a new one by itself. You'd want to confirm, but I think it is compatible with the Gemini Xera (new, XM-L led) and Titan (MagicShine clone, in both P7 and newer XM-L) as well.

The magicshine/titan have aftermarket lenses to change the field of light. The Xera also has a reflector available (instead of the optic) for a wider spill.