Yes, currently looking into S12 due to larger heat-sinks and shallow ref. It can be nice choice for this mod:

Even reflector height is almost same, 11.1 for S12 and 11.3 for S2+ (spec says it’s 20x12). I will only need to 3D print reflector holder if necessary. I will most likely buy new 22mm boost 3A driver from Simon, it has temp stepdown.