Have you checked the thread on the Regular S6 forum about Tips and tricks for better battery life? There has been a couple of more updated tweaks that has helped a guy that has had a long time issue with the battery life, mostly on Standby, so if it worked for him, it may work for a lot of you with similar issues, hopefully for everybody.