I rely on /r/flashlight to tell me which flashlights to buy. I bought two based on their recommendations and they were awesome!
For the record, I wanted 18650 based flashlights last year and after a search over there I ordered (not affiliate links):
I've been super happy with both.