I had the N7 and now have the 7 edge. I am going with the S8 +.
Reason I'm going with the plus is it is like the N7 on the edges and they brought the edge app that I used on the n7, the one where you can just draw a box around a paragraph in a web article and paste it in a text. That's all I ever used my S pen for on the note series, so looks like maybe the n7 ordeal converted me to the S series..the S7 edge and S8 are big improvements over the S6 edge, I returned that phone.
I can see the fingerprint sensor either the whole screen deal or the sensor itself is moved on the back on the note 8, that will probably be the biggest improvement for me. Bigger screen won't bother me, and if it's foldable, not interested in that either.