Thumbs up on the calibration. It worked well today. Used it all day so heavily at some points phone temperature reached 48.7 fahrenheit...and after about nearly 18 hours still on 45%. Big battery but still good. Didn't notice any unexpected drains.
Another factor was switching to 3g for the beginning.