I modded one of my Tool AAs (the Panda White) some time ago and I used a pebbled TIR lens from Yajimei.
I used one of these without the white holder:
https://www.aliexpress.com/item/2048689105.html
In mine I am using the glass lens + TIR, and then a thicker driver, what originates that there is “gap” in the threading oustide. I had to use more grease and another ring externally to help “sealing” or trying to avoid any water or dust penetration.
Still, it serves well and gives an awesome floody beam!