Charger that's also a power bank

Given that your previous bank/charger was the UM10, I assume you are looking for a single battery charger/bank with 2.4A output.

Right now, it looks like the best all-arounder would be the Opus BT-C100 . It may, however, be a little on the long side for your needs.

There is also the Thrunight C2, which is basically a removeable battery version of the Anker lipstick charger. The problem is it is buggy right now and temporarily discontinued until they can work out the kinks.

There also was the Klarus CH1 and the always budget-minded Millar ML106, but those may be outdated.

Hope this helps.