Head unscrews to change battery in this example.
16340 usable probably a good idea by itself. The beauty of the CR123A is that it’s a 1500-1600 mah small battery with a 20 year shelf life that doesn’t mind being stored in extreme weather. Olight built a few good weapon lights and I own a few but rechargeable adds extra complexity. A very small and simple system that always works is wanted in this field. Imagine your police or military sitting down next to an outlet recharging their equipment instead of completing the mission at hand. Like kids at a mall recharging their phones. 650 mah rechargeable vs 1600 mah quick replace. Actually this should not be an issue needing a magnetic rechargeable system. A single CR123A should give well over an hour of run time. This is a weapon light not a flashlight, no body should be using their pistol as a flashlight for extended times. Dark area with a threat that warrants a weapon to be draw only a few minutes.
Streamlight and Surefire built the best switch systems. Two styles both excellent.
The 24mm finned head of your DS series lights with a solid TIR lens would be a good start.