Based on your past use and present criteria I would look at:
Reviewed here: https://budgetlightforum.com/t/-/4894
Or you could take things to the next level, and treat yourself for the holidays, and consider:
http://www.intl-outdoor.com/shadow-jm07-pro-stone-white-limited-edition-flashlight-p-270.html but you'd need to buy a battery and charger too...
I just ordered: http://www.dealextreme.com/p/fandyfire-hd2010-cree-xm-l-t6-600lm-5-mode-white-led-flashlight-1-x-18650-107154 but you probably would not like the reflector diameter...woops, and I just noticed 5-mode, but I'm changing the driver in this anyway...