Okay, here's my shopping list. Any objections?
https://www.batteryspace.com/PCB-for-7.4V-Li-Ion-Battery-Pack-3.0A-Limit.aspx
https://www.batteryspace.com/smartcharger12afor74vli-ionpolymerrechargeablebatterypack--ullisted.aspx?variation=7487
I have a couple of Amazon items too, but I can't link...