My Samsung never lasted more than a year because of the batteries too. I switched to a OnePlus 8 and its still going strong after 3 years. For example it's 10pm now and I'm still at 57% battery without charging today, although I haven't used it that much.
But with that said, I had major issues with the screen being really unresponsive, I'm not sure what to replace this with next year, maybe a pixel.
OnePlus 10 Pro is what I was looking at today. mid-range in price, but seemed decent. Pixel seems like one to check out - according to the comments. :)