So until Note 11 bla bla bla, don't want to upgrade, lastly your phone dies.
LOL
At least upgrade to Note9.
More worth than waiting.

Do you use the S Pen?
Then if you did not utilise it much, maybe can opt for Huawei since you want that camera quality like Huawei.
Or S10+ is good enough in terms of camera performance.
I am using both platforms but seriously I just cannot stick to one platform only due to some limitations in iOS such as file management and also my heavy reliance on the S Pen.
I only love to use iOS is because of the apps. It is optimised better on iOS.
But for work, my Note9 is still my workhorse. Samsung DeX is just too important for me to change to other brands. And also Samsung Pay that just become my go to wallet where I go.
It is up to you which is better for your usage.

I would tend to disagree. The best of androids especially the Pixels and Oneplus are just as fast or not better compared to IOS. Samsung Experience though fluid still needs a little polishing to be just around that level. 

Well the Note10+ is good enough for you. The only ommision when compared with P30 Pro is the zoom capability. You still get a Night mode in telephoto, wide angle and selfie camera.
So that is good enough.
You still have the option to buy a 3.5mm dongle if you still need a headphone jack. And I suppose to expect that since you use iPX, you should be accustomed with a no headphone jack smartphone. I have been living a dongle life with my iPhone quite a long time, so far it does not bother me much at all.
And you get a lot of improvements over your Note4, which is a really big upgrade for you. The only thing that the N10+ not have is the IR blaster, hp jack and removable battery. I know the Note10 is not what we expected it to be, but for users Note8 and below it is a really big jump for them. For us Note9 users, not so much.