I may have found a possible fix?

My phone has just decided to have normal (and somewhat improved) battery life now after about a week with the battery issue.

The only thing that I can see that I did was to fully charge the phone and then let it discharge completely until it shuts off. I then left it shut off for about half an hour or so. After I turned it back on, the battery life was better than what I was getting before and all the issues I was having disappeared. I've gone 26 hours with normal use and the battery is now at 33% (with 2.3.4, it would be very close to dead at this point).

I'm not sure if that's the actual fix, or if I did something else, but either way, the issue is gone for me now. That's the only thing that I did that I think could have made a difference.

The phone isn't rooted or anything, in case anyone was wondering.