Dandruff! An incandescent in 2012? Really? You SHOULD be ashamed!
If I wasn't into DIY, I'd probably still be calling the Princeton Tec Shockwave my primary, and I'd be ashamed and envious every time I clipped it onto my BC while someone else was grabbing a Light Cannon.

I think this season in my circle the Light Cannon is going to turn green with envy, both for DIY and COTS lights. (That's Commercial Off The Shelf, big thing in military lately).
I'm about to add a 1000 lm focusable mini-handheld to my arsenal, to replace the 1080 lm handheld that I built a couple years ago, which didn't turn out quite as well as I hoped (decent output but burn time limited, due to battery pack resistance and old cells).
It's a shame you aren't into DIY or custom, there are SO many things to talk about...
Anyway, if you're looking for a COTS light, maybe look at MagicShine. I haven't had one in hand, but generally reports are that performance is solid, quality is shaky. The MJ-868 might satisfy your needs quite well. If you're willing to roll the dice a bit, it could be a good unit. Claims are for 2200 lm output for 1.7 hours, which seems quite reasonable. It appears to me (uninvested observer) that their quality has been improving over the years.
I'm not endorsing the light, just saying it's one to consider.
D