I have noticed one thing with the battery life and my Milestone: Charging via USB results in a shorter lifespan. Seriously, I can usually get an extra day of use out of my Milestone charging it via the wall charger vs. the USB port of my computer. Completely drain the phone and try charging it via the wall charger ( a good 12 hours if you can) and see if that makes a difference.
Former iPhone lover to new Android-caholic. Lovin' my Milestone.
"It's not what you have on your Android out of box that defines it, it's what you can do that defines it. "