I'm hogging my own thread but oh well. After some more creative searching I found this.
http://androidforums.com/samsung-cap...ease-help.html
If you're too lazy to read I'll summarize for you. People are saying that after a few days the battery life improves, so I guess I'll be patient for a few more days and see what happens....
I'll leave it open for discussion though, has anyone else had these issues?