Switched to a Surface and it's great (except the touchscreen is useless). Use a remote desktop + homebuilt tower when I need more performance (computational simulations). Use onedrive to sync everything between them.

It's not perfect, but it does just work.