Since you’re open to an 18650… Convoy S2+ with a 45 or 60 degree TIR.
Zero hotspot, total smooth wall of light. And it being a Convoy, you can choose a driver with the amount of amps you want, even reprogram it to get the modes you want, you can use a shorter 18350 tube, put a forward clicky, add a pocket clip, change the LED to a high CRI Nichia, like I did…
Going AA/14500 route you could also put the same TIR into an Olight S15 and other S family lights, but it takes a bit more effort.
Also Spark SF5 has a mule “reflector” included, no modding required, but it’s not very bright…