I purchased the G1 on may 28th. my phone startted to mess up on me, so i took it back to the tmobile retail store. the day that i took it back was when i was getting my cupcake update. they gave me a new phone at the store, i was wondering if i would still receive the update, since i was already receiving it when i took it back. will i get it again? and will it help with my battery life?