This whole thing is a freakin nightmare. I love my Note 7 and do not see any comparable option if I'm forced to give it up. Everything else seems to be a big downgrade, including the S7E (only 32gb internal) and LG V20 (no wireless charging, bigger phone, and ugly IMO) and definitely the iPhone7 (no quick charge, no user flexibility, wouldn't work with my Android watch, gigantic bezels).
Not to mention I bought a boat load of accessories - bunch of cases, wireless charging dock, usb-c wires, etc that I wouldn't be able to get refunded (bought from Amazon, Ebay, etc).
If we absolutely have to give up the phone, Samsung owes us BIG TIME, like do something to give us priority to get the S8 or N8 without carriers hassling us about early upgrades, etc, or some big credit or something...