Fully agree. I still have my 7T Pro, and I’m not looking forward to upgrading it when I have to! I loved when it was a simple upgrade on base android, but with the newer versions, it has veered away from that. I’m disappointed with the updates - I haven’t done the latest update as lots of people are complaining that it’s very buggy, and it doesn’t look like they are going to update it again.
I don’t think I’d go for a OnePlus again - I’d probably go with something more stock, with hopefully more reliable updates, like a Pixel.