I finally switched to Samsung S20 last year, and my wife to OnePlus 8T. They were more expensive, but we got better hardware and noticeably better battery life.
On the software side, the Samsung S20 is not only bloated, but buggy. The keyboard likes to die once in a while, so there's just no keyboard unless I reboot the phone. There is way too much in that phone. It's like someone said Yes to every idea that was uttered in meetings. It also likes to kill background processes very aggressively, which sometimes affects Google Maps navigation and casting to Chromecast. On the flip side, Samsung has this software (Link?) that lets you use the phone from a Windows computer and it works very well. The touch screen is very sensitive and the screen has these slightly raised round edges, so sometimes grabbing the phone sends touch events which is fairly annoying.
I was pleasantly surprised with the OnePlus. Little bloat, compared to Samsung, hardware is very solid, didn't notice any glaring software issues, no weird stuff. I'm not sure how open it is to flashing another ROM, but to me it feels like a higher end Nexus phone.
