You are starting with 2600 Mah packs I'm guessing? And that puts you about 450 Mah or so per flight?
I was using the total estimate per flight.
Are you using redundant switches as well? I have a heavy duty Futaba switch installed, never had a problem with them, so didn't see a need to change.
Taildragger has a combo pack, 2 2500 packs with charger, so I'll probably go with that.