Reflector cleaning? You know about those special fluids for cleaning LCD TV? They usually come in set with fine microfiber rag.
So after drilling use compressed air (i have air compressor), after that spray it(5-8 times) with LCD fluid and after that blow with compressed air again. Now it will be dry but now use spray (1 time) with lcd fluid and then use microfiber rag to clean reflector out (put rag and press it firmly into reflector and just do cw or ccw spinning of reflector to that rag). It will be shiner and better than stock. Use same method for main top glass cleaning.
I added thin o ring under upper reflector edge and pill is copper tapped.
I found desired focus with fine pill ccw screwing and with mentioned very thin oring(probably not needed) under reflector upper edge + eye centering method which can be tricky…
I hold light firmly with benchvise (but you could firmly hold it with right hand) while i fiddle with reflector with left hand and when I center the hotspot that it looks perfect to my eyes on high ceiling(low mode of course) than I just hold it on that position and super glue it very thinly on several points of reflector. Fine tipped super glue helps here.
So once when it is locked with supper glue additional press of glass and bezel will tight it up even more. Reflector spinning can’t happen with this method cause reflector is locked with super glue.
You may use your own methods but if you did this way and if you messed something with glue just use hot air gun (short time around each edge) and glue will crack; clean and you can start again.
New XP-G2 should give you around 240 kcd(depends on light meter you have ) and only 3,6A current draw(new xpg2s42b I have at home) which should be good for FET driver combination.
Longer runtimes in turbo mode are desirable in single 18650 lights right guys?
Edit “stripped a 16mm mcpcb and adhered it to the pill to act as a spacer”
No. I added it for better heat transfer. You don’t actually need that. So it is not a spacer. It is probably even easier to set focus without that. Use thermal glue(artic alumina so no room for mistakes here) with hard press and you should be fine with heat transfer even without additional chunk of copper.