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.
If 2 hours is the claimed run time, you won't get that run time in the cold. Especially if it's really cold. Every type of light will have this problem in the cold. Some a lot, some only a little bit.