It looks like Wayland isn't quite aiming to replace X, but it's close -- X will run on top of Wayland (one day).

More about the architecture:

http://wayland.freedesktop.org/architecture.html