Not a good situation at the moment as there simply are no comparable alternatives....and in 2 weeks I start flying weekly so I am going to have to make some sort of move.....
Honestly, this was / is a great phone without the gimmick curved screen the precludes a viable screen protector. Other than that this phone has everything I wanted.
IF we are forced to switch, I haven't a clue what to so. The 7 Edge has worse edges the S7 has too small of a screen, the V20 coming out isn't waterproof and has a lesser quality screen and the iPhone 7 plus just isn't user friendly if you take a lot of pictures and constantly need to sort them into individual files, plug into your computer and easily transfer things, etc.
I am starting to think that the only realistic alternative that is remotely close is to go backwards and find a new or lightly used Note 5. Worse battery life, no waterproofing, no additional storage.
Don't really want to go with an S7 and get stuck living with it. My eyes and work need the bigger screen.....