I note your post several months old, so by now you probably realize the S6 battery life is less than great.
I made same move and have somewhat of a solution to helping.
First keep apps closed by clicking bottom left button and "Clear" apps though out the day.
Secondly the wireless charge pad...