Seems to have improved a lot with the latest weekly rom. It seems like I'm getting almost an hour more of screen on time and the phone isn't running that hot anymore.
