I prefer tube styles too...been looking for a good 20 or 40 watt, 22 mm diameter
18350 or 18500 that's not a light saber.
We probably don't see too many cause it's easier to cram all the electronics into a box. lol
Let us know if you find something!