Haha - yeah, waiting is the cruelest part of this hobby. Waiting for new helis, waiting for parts so you can fly again. All I do is wait. Last year I lost all my helis because of financial problems so I only have the one heli and it is out of commission and looks like the dude selling the servos has not sent them.
Yeah, that bigger battery is a must, make sure it is at least 20c and 1000mah, then you just buy some velcro so you can slide it into the canopy at the bottom, inside the canopy and attach it. You could get awat with 1200mah. The stock battery will make wind much more of a problem, especially because you need all of the weight right in the front of the nose, which you can't do with the little stocker. Trust me, you won't regret it. Go for one of these, don't go for those fancy batteries, they are all bark and no bite, just get a cheapy like this, mate;
(I can't vouch for that seller though, his feedback score is not the healthiest, but you're only risking a few quid)