Another option would be to add some DC-Fix to a non-TIR lens, such as with a T2/T3/T6. I recently added some DC-Fix #3 to an H2 due to beam issues, but it also acts similar to a TIR lens since it diffuses the beam.
Here’s more info on it in case you are interested: DC-Fix Diffusion Film ,Amber and Zircon minus green filters
And here’s my H2 mod post which show before and after beams: What did you mod today?