Recommend me a new smartphone please!

[Flying machine]

I've had an S7 Edge for a couple of years, which does everything that I would need, but it developed a thick pink line down the right side of the screen that I understand is not unheard of (phone never been dropped). This is annoying and I could live with it or even get it fixed, but new screens seem rather expensive and presumably there is no reason it wouldn't recur at some point. Anyway, that's got me looking for a new smartphone, but this failure has completely put me off another Samsung. What are currently considered to be the best alternatives? Could you recommend a good android? I'm also thinking of switching to Apple, possibly an 8 or an X.