I agree with most everything you said.
Only thing I disagree with is that the S7 or S7 Edge isn't a downgrade on paper. I see it as a huge downgrade on paper, and an even bigger one in real life, when you compare small non-paper details such as the amount of curve on the edge, the ugly shape of the corners, the USB 2.1 (ok, that's on paper, but it sucks LOL), etc.
Sadly, there truly isn't another phone out there that's even REMOTELY comparable. The LG V20 looked like a possible option, until people started reporting BootLoop 2.0 on it, and even if that wasn't an issue (could swap it at a dealer, potentially, if that happened), the brittle and fragile camera glass IS a HUGE issue. The idea of having a great dual camera on my phone, only to have it become unusable because there is a giant fracture in the glass. The possibility of glass shards cutting me or embedding in my hand isn't exactly appealing either. The Pixel XL 128GB looked like a great option... until Google apparently only made 25 of them and sold them all in the USA, making it impossible to get one in Canada for 1.5 to 2 months (according to the interwebs, so probably 3-4 months in reality).