s2+ with xhp50.2 h1-a driver

That sounds like exactly what I did ^_^. Placed a Nichia 144 inside a Convoy S2+.

Please see my build thread here: https://budgetlightforum.com/t/-/50373

I should note that the Nichia 144 dies have a little bit of an uneven phosphor coating, so I recommend a TIR optic to help smooth out the light to avoid the 'fried egg' yellow centre portion of the beam. The result is very even and nice :).