Should I buy Surface pro, or wait for some weeks?

I'm starting my master's program in a few days and I'd like to buy a computer to accompany me. I think that surface pro is a great match for me but the battery life is almost a deal breaker. Is there any chance that surface pro 2 will launch earlier than the predicted 1 year cycle, or should I go with 1st gen surface pro, and at February sell it to buy the newer one? I certainly cannot push further back the purchase of Surface than early September, when the classes start. How much do you expect to sell a 6 month old Surface pro at that time? Would a new cover resolve the battery issue? PS. I think that MS should align surface launches with back to school periods.