moto g3 battery

I upgraded my primary device from G3 to G5s an year ago with the sole reason being the aesthetically pleasing aluminum design of G5s. Though the G5s is in working condition it is a horrific device, with a flickering display and insanely heating issue, I can make an omelette on it. I want to...