Hey Blue,
If I were you I would seriously consider the Galaxy S7 Edge. I have it and it has been nothing short of amazing. It has a much improved battery (3000 mHa vs 2550 mHa in the S6) and much faster processing speed as they are using the Snapdragon 820 CPU and Adreno 530 GPU which is the best of any Android device out there today, and it shows.
The camera has been greatly improved, albeit lower MP, but as it now has a 1.7 aperture, low light pictures are much better and auto-focus is much faster: you'll be getting some of the best (if not the best) pics of any smartphone out there.
It also has some awesome wireless chargers available that work really well.
All of the above coupled with the fact that it's now water resistant, the gorgeous curved glass design, the incredibly snappy UI, and the over all feel of the phone make it an instant buy in my book.