Just going through some lights of equal diameter and found that the old cheap Ultrafire Focus-590 (18650 light) tail cap fits/threads and works.
Still not as good as wire across the battery to tube, but way brighter than stock.

After I get the pill out, will shunt that spring and see if it helps.
Later,
Keith