TIR Optic to fix Tint issue with Olight S15 ?

After some experimenting & testing, im learning the “green tint” plague of the Olight S-series Baton lights (S10,15,20)
is mostly due to a badly designed reflector angle.
I tried nearly a dozen different tint bins of CREE emitters, ( XM-L , XM-L2, XP-L, XP-G2, XP-E2, etc. ) and every one of them in the S15 emitted a greenish ugly tint, even without the coated glass lens in place, ( the XM-L warm white was the worst, with the XP-G2 N/W the best of the Cree emitters) i tested the same emitters in a couple other similar lights including a Uniquefire G10, and Solarstorm SC01 and there was no greenish tint, even the original S15’s riginal XM-L2 emitter was completely different tint and with no green hue in the other lights.
Only the Nichia 219 eliminated the green tint hue. ( i found the Nichia had the most uniform tint consistency at all reflecting angles of all the brand name emitters i tried, with CREE XM-L emitters the worst.
The shallow odd angle of the Baton’s reflector gathered most of its light reflection from a very low side angle off the emitter, ( where CREE emitters changed its color hue drastically to a greenish hue) while most other lights with a deeper reflectors gathered its light from a higher angle keeping the beam tint more natural to the emitters intended color.

Below is a test of three different emitters showing the “Tint Shift” inherent on CREE emitters.
The bottom inset image on the lower-left shows a CREE XM-L2 3B Neutral White at a 90 degree angle to a white sheet of paper. As you can see here there is a noticeable tint shift to a green hue in the lower emitting angles of the XM-L. The Nichia and Luxeon however emits a much more constant tint color of white throughout the beam angle. ( middle-bottom and right-bottom pics) All the other various CREE emitters i tested showed this tint-shift trait as this XM-L2 did. (*Tests did with the same two AA cells and 47 Ohm resistor.)

Below is another quick drawing showing the shape of the Olight S10,15,20 Baton’s reflectors and how it reflects mostly that green hue into the center throw spot from the low angles, as compared to others deeper reflectors in other lights i tested.

So far the Nichia 210B i have currently in my S15 and S20 are removing most of that green radioactive tint that the CREE emitter caused.

I am curious if any one have tried to replace the Olight’s shallow reflector with a TIR optic ? and if there is one available that will fit with the least modifications ?
( The Olight reflector is just a hair under 20mm Outside Diameter. )

Below is the S15 with a Nichia 219B. The only issue i have with the 219 in the S20 & S15 is it reduced the Lumens output as compared to the original XM-L2 did. (less flood brightness due to the smaller emitter and die size.)

To avoid this turning into a guessing game, measure the ID of the head & reflector height. Pictures of the internal parts, bezel, etc. will help also to see if there's anything that can be tweaked to alter that height dimension.

That’s the only issue that my be a problem is the shallow area where the reflector rests in the S15. Many TIRs may be to deep to fit without some trimming, ( or not using the glass lens to allow more space.