Just mentioning…

Convoy S2+ with SST40 is already available in Convoy’s store several weeks ago.
The Convoy S21A (Convoy S2+ with 21700 body tube) also comes in SST40 LED only (for now). Not sure if XHP50.2 is a possible option in the future.

Going higher up in the straight-cylindrical-body tube style would be the Convoy S11 (which takes a 26650 battery), and now has 2 LED options: SST40 and XHP50.2.

I would also like to see the Luxeon LED which has been mentioned to have high output too and possibly nicer tint than SST40 (on low brightness modes).