Samsung has been seriously toning down the screen curvature and seems to be moving away from it altogether (the base Note 20 will have a flat screen, for example). If you're still happy with your S8+ I'd give it another year and see if they finally fully abandon curved screens on the S21.