Try clearing and redownloading agps data using an app like gpstest or gps status if you haven't already.
I got something kinda cool to report on battery life. I use a thing called battery monitor widget. It's constantly looking/logging battery voltage and milli amp draw, it can compare this to past logs and give you time to empty estimates either based on your usage since you installed battery monitor, your usage since unplugged or your instant realtime usage.
Now before the update there are times I'd go to work phone fully chraged up and be I'd be busy and not have a chance to play on the phone until luch or something. I'd look at battery monitor, it would say based on my non-usage since unplug the battery would last 2 days and several hours. this would be with wifi on, sync on gps on.
I went to bed last night without putting it on the charger it was around 90%, I had charged it a few hours earlier, I wanted to give battery monitor some stats to work with thats why i didn't plug in. I had wifi, sync, gps on. I woke up this morning and it said based on my usage since unplug (10 hrs) the battery would go 4 days 5 hours!