Was your Exchange email already set up when you upgraded? I was having serious battery drain issues on my brand new iPhone 4, which I upgraded to. I found that once I deleted my existing Exchange account, and set it back up, battery life improved significantly.
I have read in several places...