I've been to my local Samsung Shop twice now to tinker around with both models.
I'm sure I'll go for another look.
The s8 size is the sweet spot for me.
At the moment the s8+ feels a little too big but I'm sure I'd adapt if I chose it.
I'm a little surprised that Samsung opted to use a smaller capacity battery in the s8 compared to my s7 edge! Maybe the chipset etc is more efficient?
I'm awaiting the Note 8 too. It'll be my first Note series phone as I was about to pull the trigger to buy the Note 7 when the unthinkable happened with them.

so I bought the s7 edge and am happy with that choice.
I buy sim free Factory unlocked.
Before I buy into a product I always....
Watch YouTube Unboxings and real end user reviews.
Use the information on a few Tech Blog Sites.
Weigh up what I have currently to what the new phone brings.
Wait and watch for a few months to try and ensure it's not a lemon.
Once that's done hopefully the Note 8 will be Unpacked and then I can make an informed choice.