Here’s some more photos from the flashlight.
I took the MCPCB out, checked the dimensions, tried a 10mm MCPCB from kaidomain, tried different TIR optics, and also compared it with “my” FW1AA (described before).
Took out the red glue and the kapton tape. There was some thermal paste below the MCPCB, not as abundant as I initially thought, because it was more concentrated on the sides of the MCPCB.
No, those circles are not holes, just parts slightly deep than the rest of the shelf.

These are the dimensions of the MCPCB. The total height of the shelf (from the below up to the top, or what thefreeman mentioned as B in is drawing) is 3mm.

This is the Kaidomain MCBPC, that can fit IF you file it on the “corners”. It is not a straight fit. The original MCBPC needs to be put into that hole vertically, and will not fit diagonally or in other positions. There is virtually “no space” between it and the inner walls of the shelf, only enough space for it to “slide” down or up.


See the below of the shelf and the thickness.

And the driver…in case it is needed.

As for the optics, first, here’s a comparison with “my” FW1AA (LH351D, in a copper MCPCB from the EagleEyE X3R, a 3535 gasket from Simon (trimmed) and TIR from the S1R Baton I), on the right.
My modified flashlight has a gap between the bezel and the lower part of the threads, due to the height of the TIR and the MCPCB.

Also, with an FWAA:

Here’s a comparison of beam profiles.
VS “my” FW1AA (right)

VS “my” FW1AA & FWAA

And now, some experiences with different TIR Optics.
First, the one of S1R Baton I.
The glass lens was NOT used, the black gasket was not used. If the gasket was used, the TIR wouldn’t sit correctly, and if the lens was used (with or without gasket), there would be a gap between the bezel and threads.
However, since those 2 elements were not used, there was a slight gap between the bezel and the TIR, which makes the flashlight not waterproof.
The beam generated has artifacts, light circles around that intense and typical hotspot that the SIR Baton has. There was some spill.
The beam, compared to “my” FW1AA, has a stronger hotspot, a slight tint shift in the corona, and less spill but it still exists.


This one is with a 15mm Yajimei TIR optic that I had laying around.
This one is a clear lens, narrower beam, less large than the optic above and than the original reflector.
Since it has a small hole for the LED, the black gasket was not used, but since it is less larger than the bezel, the glass lens was used. Given the height of the optic, there was a small gap between the bezel and the threads.
The beam generated is not good, due to the bad centering (no gasket) and the clear surface of the optic. The center has a “hole” and is yellowish/greenish, and the overall beam is “yellowish”. Not good at all.
I could have tried a similar optic - 60º pebbled - , but since this is a “thrower”, it wouldn’t be worthy trying a completely floody optic, in my opinion.



@ JaredM
Given these experiences, and given that the 17mm Yajimei optics is taller than the 15mm optic, I would say that…. maybe it can be used without the glass lens and eventually without gasket, but without certainties about generating a gap in the bezel/threads.