I had to give up my Galaxy S5 due to the third battery turning into a spicy pillow and the internal storage was starting to fail (you could delete all the apps and data, essentially factory reset it and the 16GB would only let you use 1GB of it)
But I often tried modern phones and was always unhappy or frustrated. I wanted to keep my Samsung UI so I went with a Galaxy A03s (everyone says it's junk but I often love what everyone else hates--heck I loved the HTC Thunderbolt) and despite one instance yesterday with downloading music from Amazon, it's been a great phone so far. 5000mAH battery makes two days easy. USB-C port isn't faulty. Dynamic lock screen is nice. Unlike the S20 FE 5G, it doens't make sound for every notification, and the Google Assistant actually works. So far I'm loving it. I was trying to find the modern equivilent to my S5, and specs wise this one fit the bill (despite not having an IR blaster, removable battery, or heart rate sensor). One UI 5.x is a nicer upgrade compared with 2.x.
Hope you find something that satisfies you, too!