I have a small request. I know it's an extra step but this needs to be done before you blame an OS for your poor battery life even if that's the only thing you've changed.
If/When you upgrade your OS and you're experiencing poor battery life, please attempt a clean install of the OS (no extra 3rd party apps) and see where your battery life is with NOTHING else on the phone except the OS.
I know this sounds like a pain in the ***, but I've found that apps cause way more battery life issues than the OS itself. If you still have issues then I don't know what to tell you other than re-install, but in my experience the OS by itself is rarely the issue (more than a single % or so an hour).
Slowly re-install your apps over time and see which one triggers your battery rape and hold of installing it til the next build (or a new version of that software releases).
My $.02
edit: I've done the above on all builds and found the culprit app and removed it. After that I've never been able to pull less than 36-48 hours minimum between charges (usually dies on the 3rd to 4th day under moderate data and web browsing (75-125 msgs/day) use but light voice (30min to an hour/day)).
---------------------------------------------------------------------------------------------
edit2: My settings for those who care to try and replicate them:
Backlight Brightness:
10% (unless in direct sunlight, I rarely have an issue seeing the screen @ this level. Although I do have a MFG CANADA model which I've heard are brighter than the Mexico MFG ones). This is a HUGE drain on battery saver. (Verified on several of my friends' models that canada builds do in fact have brighter screens than mexico builds for some reason)
Backlight timeout:
30s (self explanatory)
GPS Location:
On (this shouldn't affect you unless you're one who leaves BB Maps open or Google maps in the background or dial 911 or something else that demands location be found. That or the government is after you and trying to track your phone

)
Mobile network selection:
Global (if you're in an area where CDMA signals are weak/spotty, and the phone might attempt to switch to GSM, i suggest you switch this off. Conversely, your battery will suck anyway in weak CDMA areas as the phone will struggle to reach a signal anyway...)
---------------------------------------------------------------------------------------------
edit 3: The reason most people experience severe battery drain outside screen brightness, is when an app is holding your data connection open or checking too often for updates (see: weather apps, gps downloading maps as you move around, etc). Check your update settings on these apps to have them update hourly or manually instead for best results.
---------------------------------------------------------------------------------------------
With the above settings I get 3, almost 4, days under the usage I stated above.