I'd bet either of those will do well for you. Don't quote me on this, but I remember reading somewhere that anything 2000mah and 20c was good enough for 6min of 13.5 and higher. You multiply the mah and c rating and that gets you how many amps the batter can handle. I tried looking it up, but I couldn't find how many amps a motor would use depending on the turn of it. I think that would be good info.
I know this won't help you decide what to buy, but it will confirm it for you after you have made a purchase. Run the packs, your pack should not get hot. Just a little warm. 100f is normal and 140f is danger zone. The pack will get hot if it can't put out enough amps.
--pakk