The CL1H with SMO reflector has great throw. I'd go for the new 2-stage digital Q5 pill and run it with a AW 18650. The 2-stage multi-power pill can use other battery types, but it isn't as bright as the 2-stage digital.
Then 6 months from now, or whenever, if there is something brighter available you just buy the new pill and pop it in. Couldn't be easier, and saves you the cost of buying a whole new flashlight.
The Dereelight DBS will throw even farther, but it's a larger light than the CL1H.
If you go with a CL1H be sure to get the new V3 (version 3).