Went back and forth for weeks on this decision and it wasn't easy. Ultimately went with the S7 Edge yesterday as it's closest to the Note 7, got the same silver color, similar camera, edge screen, SD card, can use my wireless charger still, and I'm hearing that Samsung is doing deals for those N7 customers sticking with Samsung when the S8/N8 comes out. I also got in writing from Verizon I could upgrade after 50% paid off instead of 100%.
I tested the LG V20 and wanted to like it, but after playing with one last week, side by side with my N7, the screen wasn't nearly as nice and the camera didn't take as good pix (bunch of blurry ones in lower light). Couldn't compromise a worse camera for 6 months (or longer depending when N8 is out)
Tested the Pixel XL head to head with my N7 too and the screen and camera were very close, but the boring iPhone form factor (huge bezels), no SD card, no wireless charging and no water proofing turned me off.
S7E had more of what I liked in the N7, minus s pen and screen size, of course, and I can make it almost look like I had my N7 (Nova launcher helps). Hopefully I'll be back to the next Note soon!