So I rooted my phone this morning and flashed Unnamed Rom and what a difference. This rom is based off 2.3.4 and is very stable. It removed all the bloatware and added the Ice Cream Sandwich animations. I was a little nervous rooting but I am so glad I did it. Anyone who is experiencing battery problems with the new update (2.3.6) I highly recommend you flash to this rom. Its based off of the stock rom which I really like.
[ROM][2.3.6] UnNamed v2.2.1 - (12/22/2011) - Improved battery life and performance - xda-developers
[ROM][2.3.6] UnNamed v2.2.1 - (12/22/2011) - Improved battery life and performance - xda-developers