RE: Motor quits when advancing throttle
You don't want to stay with the large prop and simply get a larger battery, because all that will do is pull more juice than your motor can handle.
I'd suggest a 9x5 GWS HD prop:
On 3s TP 2100 (momentary peak measurement)
10.8A, 10.4v, 112W, 576g (20.28oz) thrust
Your 830 packs won't provide quite this power level, but for your motor's sake (8A max limit) I reckon that the 7-8A they will be able to give, would be ideal. A 9x4.7 APC SF could be good too, but a 9x6 APC SF is too much (~15A again).
Cheers, Phil