With regards to ‘short tube’ 21700 flashlights, eg. the Wurkkos TS21 or Wurkkos HD20, but using the “20350” tube.
Note: “20350” batteries, which are not the same as “26350” batteries.
“26350” is the shorter version of 26650 batteries.
“20350” is the fatter version of 18350 batteries, or can also be the “shorter” version of 21700 batteries (I’m not aware of “21350” batteries).
Unfortunately, I don’t think that at this time, there are Vapcell rewrap of 20350 batteries. The Vapcell A20 is a 26350 battery, not 20350 battery.
I’ve tried “Kfalo” brand 1400-1500mAh 20350 batteries from a local store here in our country, so far it’s the only 20350 I’ve found that can deliver to me economically (I suppose for other countries, there may be other 20350 brands). But as there are probably few original manufacturers of the 20350 battery type, they probably are not very high-drain type, but usable.
With regards to the EC06, I suppose a balance of power and capacity will be better.
The Samsung 30T will probably provide the highest output, but because it has smaller capacity, the higher output will last shorter.
I suppose the Samsung 40T or Molicell P42A would be a good balance. In particular, the P42A is usually cheaper than 40T.
Or can also try getting the Lishen LR2170LA, which based on reviews, seem to perform nearly similar to the 40T, and at less expensive price.
(I’m not very sure, but I think the Vapcell K40 21700, might be rewraps of the Lishen LR2170LA)
You can also check the Vapcell T50, these are high capacity with high power (may be a bit less than 40T, but has more capacity). The downside is the the T50 (rewrap of Samsung 50S) are rare and very expensive.
Another option may be Vapcell G50 (Samsung 50G), or possibly Tesla 4800mAh 21700 (but these seem to be from surplus, and quality can vary quite a bit, otherwise the Tesla 21700 batteries also perform quite well, maybe just slightly less than the G50 / 50G). Tesla 4800mAh 21700 tend to be inexpensive as they seem to be from “surplus”, but with a bit more varied quality.