Sprint Touch Pro - Battery life = 6 hours?

[Gearhead01]

I know the TP has marginal battery life, but lately I have only been getting 6 hours of light use with my Sprint Touch Pro. I am still on the stock Sprint ROM, running the Telus radio, and have used Diamond Tweak to maximize battery life, including turning the data connection off after 1 minute. I have email set to check every 30 minutes (1 account) and weather does not update automatically.

With this setup, I go from 100% to less than 20% charge in 6 hours with just a couple of phone calls, a couple of texts, and an occasional check of email. This seems worse than normal for battery life. Also, this happens with both my stock HTC battery and a new Mugen 1500mAh battery. Any suggestions?