I've got a Micra that I'm modding currently. I have ordered a McR-18 reflector and a UCL glass window. This apparently gives it a good hotspot with a nice side spill, and is brighter than the optic. I'm keeping the optic for 'throw'.
There are some head swap changes available, you can replace the LED, and probably put in a converter board for a different regulation.
Two stage switch--I have only seen, not tried, the 10 ohm resistor in the clicky.
I've found the info slow to acquire.
I guess if you were inclined you could basically re-build it to custom specs just re-using the case.
Greg