I disagree with your take on the Samsung. While it's not perfect, it's the best (and sometimes only) option for most people who want an top end Android phone. Google sells it's phones in only a handful of countries, same with Oneplus, LG and Sony and all of them have their own compromises. So in many parts of the world, its either Samsung or a Chinese manufacturer like Xiaomi.

I find Samsung apps to be much better than their Google counterparts. Samsung Health, Internet, Calculator and Notes are examples. Besides, they fit the UI really well along with the menus and other things. And whatever annoyances you've experienced can be tweaked since the UI is highly customisable (bar none).

In terms of long-term support, Samsung also provides 3 years of upgrades and 4 years of security updates. That's the best from any company bar Apple and it extends to their midrange devices too.