one small thing, which of course depends how much time you have before you must buy the new light: the DX1 from Lumapower is supposed to come out with a DX1-RV version with much bigger throw. But we only have seen some proto pics so far, I don't know much detail even though I've tried to follow all posts on the matter. Timetable could be a few (even just a couple) of months at a guess.
I think it's a relatively larger formfactor, though, so it also depends if you need a small flashlight (the M1 is a 2xCR123A or 1x18650 formfactor) or can do with something a bit bigger (but still not Maglite-style bigger!).