I'm guessing this is going to be an unpopular take here. Earlier this year I got a Xiaomi and have had a great experience.
I was getting frustrated with my s10's battery life. I've replaced phone batteries before but always end up cracking the glass shortly after. So this time I spent around 300 usd on a Redmi note 13 pro. It seemed like a hassle to flash but I was able to get rid of all the bloatware via adb. The benchmarks are comparable to the S10 and with my settings the battery easily lasts 2 days (unless I play games). It also has a flat screen and a 3.5mm jack. No Bixby button.
I don't know the security implications of buying a Chinese phone but I have solved all my complaints about my previous Samsung phones by switching.