If you want longevity in hardware, more (perhaps niche) features, and don't care too much about any software updates: The S10
If you like experimental hardware, care about (fast) software updates, and don't care about certain features: The OnePlus7 Pro
I have the S10+ right now, and I was briefly considering switching to the OP7Pro. Ultimately, not knowing how long the hardware will last, paired with missing out on several features that are important to me (mainly wireless charging and having a headphone jack), meant that I stuck with the S10+.