Sorry to hear you are still having bad battery life issues.
I did the usual turn off all the apps that I will never use, and especially anything with Amazon in the name. That app was really hard on my S5's battery.
I now control the internet with MacroDroid.
When the screen is locked, MD turns off WiFi and Data
When the screen is unlocked, MD turns both back ON.
I get around 2 to 3 days use all the time. My last cycle was to pull it off the wireless charger at 0500 Friday morning and go to work.
Then last night, around 6:30 PM I got a call from a friend and I noticed that it was at 17%. Not bad, the end of the 3rd day. We talked a couple hours and then I put it on the wireless charger pad again.
This morning, it is back at 100% again and ready to go.
So, if you don't have a real hangup over turning the internet off when the phone is idle, why not give that a try?
You can do it manually (a PITA, but I did it for a while) or just install MacroDroid and set it up to monitor the screen. It only takes about 2 seconds for the internet to be ready to go when you unlock the screen.
* MacroDroid - Device Automation - Android Apps on Google Play
* MacroDroid Internet on/off as needed
* MacroDroid, setting it up