Samsung phone suggestion

Hi
Hi i'm planning to switch to a ultra flagship samsung phone. Hoping that you can help me decide. I'm coming from oneplus 8, had it for a year but im looking for a much better screen, better camera, and better battery, in short a tier up.
Here are my choices

1. S21 ultra (exynos) - really good reviews, but when I held it, it doesnt feel special to me coming from oneplus 8. Can get this for $1000 brand new or down to $800 if i use the trade in program (will trade an iphone 7)

2. Note 20 ultra (snapdragon) - I super love the display and the boxy design of the note, it doesnt feel very similar to my oneplus 8 thats a plus for me. Cons are the camera based on reviews is not as good as the s21 ultra as well as the battery. Can get this for $850 brand new (snapdragon korean variant)

3. Note 10+ (exynos) - again I love the design and this is cheap I can get it for $500 bnew, though I feel this is more a sidegrade and actually a downgrade on some areas coming from oneplus 8.

4. Wait for the s22 ultra