I have another flash light form factor for you, the Petzl Zipka has been my choice for years now. They are fantastic because there is no headband getting in the way when not in use. It is so small you can just drop it into a pocket and forget about it until needed. I never leave the house on any sort of geek mission with out one! Also a version with a red light for night time ops.
http://www.petzl.com/en/outdoor/tikka-zipka-series/zipka
http://www.petzl.com/en/outdoor/tikka-zipka-series/zipka-plus