I would give the xintd x3 a look, it’s new and probably not available for a week or so yet,
it can use 3aa or a 26650 cell (or 18650 with a sleeve).
it uses the new xm-l2, the favoured qlite driver (choice of modes on the website) will likely end up with a choice of emitter tints. It should be a good ground up light that I can’t wait to get, it would also give you the option of just buying the light and using it on aa cells (more than likely with reduced output tbh) then when you are ready, you can buy up a good charger and 26650 cells for some good output.
Knowing intloutdoor, the build quality will be well above average for a “budget” light and the options available will cover many of the points made above - tint, moon mode, new emitter type.
If you just want to go for it, I dont think you’ll go wrong with an xintd c8 v4
http://intl-outdoor.com/xintd-c8-v4-xml2-t6-18650-flashlight-p-308.html
you can pick up a pair of good cells and acceptable charger from fasttech for $20, dont forget to use coupon code blf.