Xorg getting replaced is bound to happen, even without wayland. Security is not an afterthought anymore and getting Xorg fully locked down without sacrificing functionalities seems to be impossible.