I'm starting to lean towards hanging on because yesterday I was able to get 24 hrs 37 minutes and 7 hrs SoT, which was a huge increase from what it had been. That was still with mostly casual useage--web browsing mostly, couple phone calls, 30 minutes of maps usage and about 45-50 minutes of YouTube. I've yet to game or use streaming services on this phone. But it definitely looks more favorable tan it initially did. I havent had a chance to do much video recording since the other day, so I really need to test it with that again and see of whether or not it gets super hot again while doing so, or if the battery has optimized itself via adaptive battery. That one is a big test that needs to be passed. But overall it looks much more favorable now.