If you want to keep running X then do so. There is nothing incompatible or wrong with using Wayland on your desktop and X apps on your server.
The way we do X now is kinda a throwback and nobody would do it this way if they had a chance to start over. It's like designing a operating system were your web browser is required to have the ability to fiddle with bits on your PCI buss. It's a network protocol and there is no good reason why your display software needs to drive your hardware.
Anyways who the hell runs any GUI anything from their servers? I have no less then 3 different computers of my own personal use that I have at a few places at over the internet and I don't use X on any of them.
For work I have to regularly deal with well over a thousand different Redhat boxes and I have yet to give a crap about any sort of remote GUI access... for any purpose at all.
I understand this is not unusual and I like X over SSH, but the way people are talking whenever this subject comes up they are acting like X11 over SSH is absolutely critical for Linux on the server and that having to use anything other then Xorg xserver sitting on their hardware to display it is completely unacceptable.