I have been using 2X battery app with manually turning off either 3G or wifi so that only one is active depending on where I am.
The battery usage and the charging has settled down nicely and the past two days, I have gotten the average usage down to 4-5%/hour. Now I can get full 10-12 hours of usage during the day and still have 40-50% left over.
The phone still sucks down power at an alarming rate when it's doing anything but at rest, at least, the usage is down to about 25-30mA.
One thing I have noticed is that the charging cycle pushes the battery voltage level to max and then will not trickle charge again until the voltage level is below 90% even though the reported battery level is at 100%. So depending on when you pull of the charger, your battery percentage may drop very quickly from 100%.