NANOBOT , Note8 already got a bunch of updates and fixes, such as cameras and third-party software, S10plus almost crude in terms of software, but S10plus optical head and shoulders above the same Note8, you need only wait for completion software.
But if you Note8, I would be in your place, wait for the note10.
But if S7edge, you can already move on S10plus.
My personal opinion.