An Xtar PB2... powerbank with 2 replaceable 18650s.
Can swap batteries about with other 18650 gear (flashlight).
Also can charge 18650s with a USB power source.
If need more capacity, just carry more 18650s.
Newer version has been announced, the PB2S. Will be able use 21700 batteries aswell as 18650s, and has a USB-C input as opposed to micro USB of the PB2.