Yeah, I kinda went on a TIR rampage recently…
5? Pfft. I stocked up on standard 20mm TIRs from Amazon, mostly ledworld and uxcell! as sellers. I got mostly the 20pax (each) of different types, some 10pax, from 5° through 60°, and recently of 90° and 120°. Can’t really speak about getting 1-fers of any type in combos.
Got a bunch of 26mm TIRs from LEDsupply recently, too. Those were all 1-fers that I got like 2-3 of each or so.
The S2+ will take a standard 20mm with or without the shoe. Without, anything will drop right in and sit flush on the mcpcb. With, eg, the one that has a XM-sized square cutout, will only fit with narrower-angles (pointier) and not the wider-angles (more bowl-shaped). The “bowls” press out more on the little tabs that hold in the TIR. When not pressed out so much, the tabs won’t interfere with the internal threads, so you can kinda force-fit the whole lens+shoe down the hole. Otherwise, forget it, you’d have to file down the shoe somewhat to get it to fit.
Me personally, I don’t recall much difference with/without the shoe, so it may not be so critical. I’ve taken to just dropping the TIR down the hole, make sure it’s seated flush against the O-ring, then carefully screw in the pill most of the way, flip it over, make sure the LED is in the TIR’s hole, then snug it up the rest of the way.
Beware, though, as the TIR is slightly shorter than the reflector, so you may have issues with battery contact. Might have to swap, say, the short spring for a taller stiffer one. With the shoe (implying narrower angle TIRs, up to about 60°), it adds an extra 1-2mm, so the springs will more or less make contact, albeit light, and not be too “flickery”. With the 90 and no shoe, it was almost unusable.
As for the XP-L HI, it’ll fit, but the edge around the hole in the TIR won’t have that much to grab onto. My “technique” above becomes that much more critical to make sure the TIR rests around the LED, not on it.