Ultimately, I'd try a factory data reset, just to see if that improves things. It will help you decide if it's a battery problem with your handset or something else. Make sure to back up everything in storage, particularly photos and videos, custom ringtones, etc., as those will be wiped with the factory reset.
If the phone still has bad battery life, I'd also want to try the warranty replacement while you still have a warranty (it's 12 months, IIRC) before upgrading the phone. That just seems premature to me.
I'd also look at any homescreen widgets, to see if maybe they are updating too frequently.
However, I have some other ideas:
You can also try wiping the cache partition - many people report that this helps. But you can also try switching from the Dalvik runtime to the new ART runtime - I find performance is better, and some people get better battery life.
Instructions to wipe cache:
https://motorola-global-portal.cust..._id/93895/p/30,6720,8697/kw/cache/action/auth
Wiping cache partition can take a while - 10 to 20 minutes for some people. Let it finish before manually restarting. I'd make sure that it was plugged in or well charged before you do this procedure, though.
Instructions to switch to ART:
- Go to Settings / about phone
- Scroll to the bottom, tap the build number about 10 times (it will tell you when you are a developer). This activates settings / developer options
- Go into settings / developer options, and switch the "Select runtime" from Dalvik to ART
- The phone will restart, which will take about 10 minutes or so to pre-compile your apps for the ART runtime
You can always switch back to Dalvik if that doesn't help much, or at all, or has issues with any apps on your phone. At this point, there shouldn't be many apps with ART problems.
One last tip that I read here. Every time you restart your phone, go into settings / apps. Swipe over to "All", then scroll down to "MotoCare". Tap that, wait for the screen to refresh the data size, and hit the "force stop" and "clear data" buttons. Maybe it's just my imagination, but whenever I remember to do this, I tend to get better battery life.
Anyway, what I'd suggest to do:
- Do that MotoCare thing every time you restart the phone.
- wipe cache partition. See if that helps.
- If not, try switching to the ART runtime.
- If that still doesn't help, try a factory data reset.
- If that still doesn't help, go for the warranty replacement.
Good luck. i hope it works out well for you.