Clarify the question. Make sure I heard it correctly.

I was (am?) in the same dilemma. Loved my 7 pro, but someone dropped it, cracked the screen, and things started going downhill (hardware wise) from there.

As a replacement I got an 8t (still OnePlus). It’s nice, but I miss the 7 pro.

OnePlus is no longer an enthusiast brand, and I think the Pixel is the only other one currently. Maybe the Nothing phone? That’s kind of early adopter territory still, I think.

Sorry I’m not more helpful. I prefer phones with unlocked bootloaders that allow for alternate firmware to be installed.