New 3G owner

I just purchased an iPhone 3G less than a week ago and i'm very impressed. The App store is a great feature and the internet pretty fast. My only gripe is the poor battery life, which i understand could be from constantly playing with the phone..so i'm having to charge it daily . i have not yet upgraded to 2.2 yet, but i heard doing so might improve battery life. is this true?