I'd go with the S7
If your really into photography, I'd go with the S7. The 6P has a great camera, but no OIS, which is a huge flaw in 2016. I don't understand why some manufacturers just don't provide OIS in they're flagships. If you hate the glass design you can easily buy a case, bumper or a skin. Skin would be recommended to retain the slim form factor, but it does leaves the sides exposed. Updates can be a real frustration in Android. I don't understand why carriers have control over updates, when all they do is take they're damn time choosing what bloatware to add.
