I had similar battery life problems with my S6 Edge. It turned out that disabling Google now cards solved my problems! And the irony of the story is that I went through hell to enable it in the first place as I live Cyprus and Google now is not supported! :)