Okay, so after a week of horrible battery life from bedtime to morning, I did some experimenting.
Last night, I did the restore on my phone. I let it drain to 0 battery, charged it overnight, woke up and unplugged with a 100% charge at 8am. Left for church at 9am, and it had drained to 89% after doing nothing at all but sitting on my dresser. I had wi-fi connected.
Went to church, and for 2 solid hours, the battery went from 89% down to 87%, and the only difference was that it was not connected to a wifi network. I had wifi on, but i was not connected to the church's wifi. I went to a member's house for lunch, it stayed at 87%. Got home at 2:00, and the battery went from 87-84% in a matter of 2 minutes. Turned wifi off on the phone, and now at 2:20 it is still at 84%.
So, either my wifi is screwing it up, or the wifi on the phone is screwing it up.
I have noticed while sitting at home, it will shuffle from the wifi icon to 3g over and over, like it won't hold on to the wifi signal. Regardless, with the phone not on wifi, it has no battery problems at all. When it is just on 3g, it does a stellar job, which is just awful, because I'm on Sprint.