We just recently replaced our 20 + year old mattress. I did a quick internet search and ended up ordering a Saatva
https://www.saatva.com/mattresses. They delivered it and hauled off the old mattress. So far it's been a big improvement. We went with the Classic.
And I hated the waterbeds. Terrible for sex and hard to even get out of in the morning.