Nitecore has the MH12S which is a tad longer but also has a smaller diameter head…it does retain the buck driver, though, which is nice if you want the better efficiency and/or run the two 123 cells. Not sure how moddable it is, but since the SST40 in the proportionally smaller head will be a much looser beam than your current light, maybe it could be swapped to something that gives you what you want. To me, it’s the drivers that are the standout of these lights from them, but it comes at a much higher price than other lights that maybe offer more outside of that.
Sofirn has the SP35 which is a bit shorter but considerably smaller head, so less throwy with its emitter but if you can mod you could put something else in there. It keeps the electronic side switch that you’re used to, similar but better clip, does tail stand. It has their house ramping/stepped firmware which I actually like…not nearly as feature-laden as Anduril but has some key features and the ramping is good. Output is comparable or better than what you have now (despite the numbers they all advertise).
Convoy has a few choices if you don’t mind a tail switch (still tail stands). The M21B is the 21700 version of the good ol’ M1 and he’s got those available in several emitter versions, with or without a cell, etc. Looks like it starts around $24 and goes to $38 or so depending on what you want. It’s around the same length as the MH12S from Nitecore (with both you’re gaining a little over an inch) but it keeps the same-ish size head/reflector, so a bit more throwy but of course he’s got options to be as throwy or floody as you want.
I don’t really know about this one but the Convoy S16 looks like another option with a tail switch…bit less length, smooth steel bezel instead of crenulated, more streamlined look but not quite a tube light. The S21 lights are the 21700 versions of the S2+, again with a million choices, but those are straight tubes.
Sofirn SP35: https://www.aliexpress.com/item/1005002848601801.html
Convoy M21B (picked this one only because customer reviews have photos that show the size in hand): https://www.aliexpress.com/item/1005003503885315.htm
Convoy S16: https://www.aliexpress.com/item/1005002315391902.html
Nitecore MH12S: https://flashlight.nitecore.com/product/mh12s
The WildTrail WT1M or WT3M (triple) might also be worth a look. They’re quite nice lights with side switch and Anduril, tail standing, very short body (shorter than your light now) and pocketable, and the head isn’t too wide…wider, though, at around 38-40mm. They have an aliexpress store but were closing them out (I think) on Amazon for good prices recently (easiest to find them there by searching only for the model number, maybe check the “include out of stock” box also). I have the triple and it’s a great light. Maybe not the best for edc pocket carry because it doesn’t have a clip but maybe one could be found for it.