Dude, I just did a big, long, exhaustive search on this topic for myself. I ended up buying a Cateye Volt 1600. It is very practical and can run at full 1600lm for 2 hours, but I think I will only be running in the 800 mode for most of the time.
Cateye also offers an 800 model that is even more practical. It is small and has a fast recharger that can be bought separately.
With both the 1600 and the 800 you can get a helmet mount or stick with the handlebar mount.