Here's a heads-up. The ITUO Wiz XP2 is on sale right now. They also can do a custom beam swap, so you can get one spot optic for distance and one wider beam for seeing the trail or reading maps.
No financial interest, but I have one and it's probably the best value for a well made powerful light right now.
They now have a 2-cell water-resistant high capacity battery pack, at my request. (You can find the same one online from Kaidomain for a much lower price if you are Ok with slooow shipping)
They also sell a Go-pro style headband now.
I use the smaller 2-cell battery packs on the back of the headband or my helmet.