I highly recommend you read through selfbuilt's 18650/cr123 battery flashlight recommendations. His reviews are probably the most thorough around.
http://www.flashlightreviews.ca/recommend.html#2xAA
Some of the best top picks on the market now include the "legoable" American made Malkoff lights. Malkoff's lights are highly customizable and well priced for what you get. His customer service is some of the best of any manufacturers.
Additionally, for ultra high lumens lights, look into the 2015 edition Nitecore p12, Fenix PD35, Eagletac G25C2-II with diffuser kit, Olight m22 warrior, Klarus xt11, and 4sevens quark and maelstromm lights.
You can't go wrong with any of these lights. It comes down to which UI you prefer.
I'd give the slight nod to the 4sevens quark (which is legoable) and fenix or nitecore for slim light. The fenix and nitecore are very similar with a tail switch and body mounted mode switch. The 4sevens has a rotating head for mode switching.
If you want more throw with a strike bezel, look at the klarus xt11, eagletac g25c2-II, or olight m22 with a nod toward eagletac.
The klarus xt11 has both the primary activation and mode switching buttons on the tail if you prefer that.
The Nitecore p12 was on sale on Amazon for around 50$ for 1000 lumens the other day.