Restored as a new phone and got much better battery life today.
-3G on all day
-wifi on, but not connected to a network
-A few very brief (<1 min) phone calls
-4 hours of tethered 3G internet usage (screen was off during most of this) over bluetooth to my macbook
-iPod playing during tethering for about 2 hours
-About 20 minutes of watching Braveheart during study break with brightness all the way up
-Bought a song on the iTunes store over 3G too
-brightness at 50% with auto-brightness on
-1 gmail account fetching every 15 min; also pushing contacts/calendars over the air with Google Sync
-no apps with push notifications, so that wasn't enabled (although I do plan to reinstall beejive soon)
-location services on
overall, much better than the crappy ~3 hours I was getting when I was using the 3GS restored from a 3G backup. I was very, very close to calling AppleCare and asking them to send me a replacement. Hopefully it just needed to break-in a bit, and maybe using a 3GS from a 3G backup is just asking for trouble.