Alternative to iJust 2 battery?

[Averick]

Except for the odd sticky button, I love iJust 2 batteries. For my use, they are the perfect height, width, button location, power and simplicity. Sadly, I'm running out of spares and I don't think there are many new ones to be found. Can you suggest an alternative with similar characteristics? The iJust S seems a logical choice and I'll probably order some. But I'd rather stay with a 22 mm diameter.

 

[Foggy Road]

I had some eGo ONE Mega batteries that would probably be a good 22mm match. Bought them on clearance for $10 as a full kit. Sold out now of course. So why am I tellin ya about something ya can't get?
Well I bought those kits just for the tanks. My faves. Decided to try the batteries and liked them for awhile but the height of them got old and I went back to my Picos which I consider to be much more compact than those tall 22mm rigs. Thought it might be something for you to consider. Here's a comparison between the two.

 

[Foggy Road]

Or?

Eleaf iJust ONE starter Kit

 

[Foggy Road]

Maybe?

Joyetech eGo ONE Mega V2 kit