what about the Xintd X3 at banggood, that can use 3x aa batteries so no li-on worries there.
Other wise the Convoy C8 from banggood as it is on offer here so you can get 15% off it rather than the 8% BLF gives. Option wise the XML2 T6-4C for a warm yellowy light or XML2 U2-1A for a whiter light but not the SMO (smooth) option as that just increases throw and won’t suit the uses you listed.
Actually another contender would be the Convoy M1 or M2 from banggood, they should be a bit more floody than the C8 which may be preferred also you could get $4 off of these from this Banggood christmas rush time - free $4 coupons to be won easily
oh and you say you already have some protected 18650 batteries, what are they?