Battery Life?

so, I've had my phone about a year and a half now and the battery life just seems to be sucking wind lately.  I have to charge it every day without fail and seems like it's 2 times a day!  I'll charge it overnight, before the work day ends I have to plug it in to make sure the charge lasts to get home and by bed time I plug it in again.  FRUSTRATING!!!

I do have both batteries that came with it but I almost never have the 2nd charged up... I used to alternate batteries frequently so I don't think sticking to the 2nd battery will really help matters.  The phone is a troopper but it's nearing the end... it's beat to hell, screen is scratched up (replacement phone seemed to have scratches that showed up about a week after getting it... damn refurb phones!)

As long as the phone holds out another 4 months or so I'm good... that's when I can get the higher upgrade amount  and get a new phone.  Probably go HTC Hero or something... I want a phone that runs Google and I've heard good things about the Hero.