All sounds good over here. One thing...my wife's Eris has had no less than 30 hrs per charge for a good while now. She let's it completely die b4 each charge then does not overcharge. I think that could be a key in all this. More and more use as she's gotten comfortable w her phone, too. She plays Slacker quite a bit and also browses, texts and plays games. All this and she makes a good handful of calls.
My point in all this is to strongly sugggest y'all that have battery issues to try what she's done as far as killing the battery b4 each charge. It may just do the trick!
Hope this helps y'all.