I, unfortunately, said goodbye to the Fedora distribution... I still need X11 and that will not change for a long time. Gnome is getting more and more frustrating from version to version. I went back to simplicity, FreeBSD 14.2 + X11 + Enlightenment 0.27 ;-)
Your choice is solid and will last for years. Having said that it's seems to me Wayland will be slowly dethroning X11 whether we like it or not.
I personally have no issue with Wayland because most apps I am using are performing correctly with native Wayland or via XWayland. Simply put I am getting boring as I am getting older. Now all I want is a conventional, productive and boring UX like that of GNOME or KDE.