Ideally Apple would push out a 2in1 with touch but they are set on pushing iOS for touch - which is just too limited for all intents and purposes. I would gladly buy a premium Lenovo 2in1 or some Ryzen 5xxx series ultra portable windows laptop (they are much better on thermals from what I've seen) but I still need a OSX client from time to time unfortunately. There's just no flexibility with Apple ecosystem - you either fit into their intended use cases or you're stuck with suboptimal tradeoffs.
I'd like to be more client-server these days too, using whatever device is convenient at the time but storing my data centrally so all my devices can access it, it's all systematically secured and backed up, I can also access it remotely via VPN, etc.
The key thing, though, is that I want it to be my server, not someone else's that I don't control and have to keep paying for.