I know you don't like the "18650er"-Solution, but you can harvest "good" batteries out of old laptop batteries. Maybe you want to have a look at Simple Balance Charger - Adafruit . They're using a lipo charger to charge two ("balanced") cells and switch between the two states ("Charge" and "Run") wi...