I'm taking the MBP to the Apple Store today to have the battery looked at. Its charge longevity got better after replacing the HD, but not up to the level I would have liked.

Yesterday I noticed there was a warning message in the energy menu bar item saying the battery needed to be serviced.

Fingers crossed that I can get a new battery out of this.