How about building your own convoy s2+? You can buy parts from the convoy official store and message Simon first to get the BLF discount. Buy all the parts you want then put it together yourself. Also try to add in a spring bypass. If you have a soldering iron, buy some silicone coated wire, a bit of thermal paste, and you can build your own light.
It’ll be a good starting point imo