I’ve done some “things” with different TIR optics and XPL-HI Led. You may want to see it here: Essays with TIR lenses on Convoy S2+: XML2 + XPL-HI [Update] - #15 by MascaratumB
Go to the 6th lens, A) and B) .
My favourite lenses and the pebbled ones as they “erase” most of the eggs and shifts. They probably work better with domed LEDs, but they perform well on the XPL-HI Leds as well!
I bought mine from AliExpress stores, but as Lightbringer said, there are plenty places to chose them 