I have tried these steps and suggestions to combat this problem:
- flash to CyanogenMod
- buy an extended battery
- calibrate the battery with apps
- wipe battery stats
I've run out of ideas short of bringing the phone in to T-Mobile and have it replaced. Google searching has turned up pretty fruitless so I'm asking here before I make anymore moves! Thanks for all the anticipated help.