Pretty much same here - I kept an x230 alive until I had to accept earlier this year that it just is bad for overall productivity, and ended up getting a macbook. None of the newer thinkpads are good - and they’re still one of the less bad manufacturers.
There’s also enough stuff I don’t like about the mac - but the current keyboard is one of the better notebook keyboards available right now, and if you want long battery life, lots of RAM and a lot of CPU power available in a compact device they’re the only manufacturer currently offering that.
x230 with x220 keyboard also is pretty nice - but unfortunately no longer suitable as main notebook. As nothing useful came out of lenovo after that, others are even worse, nobody has a decent trackpoint and sensible amount of RAM only exist for macs I ended up with one of those for work few months ago.