I think this conversation has turned loop-de-loops so many times, some people are starting to get confused about what is being asked for. Let’s see if I’ve got it correct. You want one thing to carry that does both a pencil beam spot with no spill and a super wide flood to fill the cockpit with a low level of light. Is that correct? If so, my recommendation is that you build it yourself. You’ve already shown that you know how to operate a lathe. You’re talking about replacing LED’s and drivers. Why don’t you just make the thing you want? Buy a de-domed XP-G2 from James3. Add a quality aspheric lens like this. You don’t have to buy from them. That’s just the first place I caught in a Google search. Get a driver from Richard at Mountain Electronics. You’ll need to decide what kind of switch/button you want to use, and get one, and make sure the driver is suitable for that kind of switch/button. Basically, there are two kinds: a clicky that turns power completely on and off or an e-switch that works through the driver’s software. Then, turn out a host for yourself on the lathe. It’s been done enough times before on here, you can surely find inspiration looking through the pages of this site. A couple places to start are Sinner’s custom hosts, and the Scratch Made Contest we had a few months ago.
You could make a zoomie, with a range from perfect square die to super wide flood. The square die is with lens out, and flood is with lens in, so make it such that the lens can be pulled all the way in to just above the top of the emitter. The closer you get the lens to the emitter, the wider your flood can be. Also, you don’t want anything extending past the end of the lens, because it will impede the flood. Another option is to make a fixed lens at square die focus, and get a diffuser for it that will turn it into a wide area light. This will be simpler to turn on a lathe, but then you have to keep up with the diffuser.
Then, of course, there is the option of using additional emitter(s) to cover wide area lighting. But, that will require a different driver, capable of switching two circuits (to the different emitters) and you will have to make a place in your host for the additional emitter(s) where it won’t interfere with the pencil beam. You could drill some holes around the driver portion of the head, and put some cheapie 5mm epoxy LED’s all the way around there. If you used 6 or 8 of the 350mA 5mm LED’s, you’d have a nice even illumination at a low level of lighting. Just tail-stand the light, and it will glow from all sides.
Edit: There is a thread here about getting dual output driver from one 18650.