Things are complicated here.

On the Werlyt front, we know Diamond Weapon is coming with Zenos as the loaded data. However there are strong intimations the G-Warrior is going to see more use, and even after Diamond Weapon is dealt with Valens is still going to need to be dealt with. One can only guess how this puzzle is going to fit together.

On the MSQ front, we've never had a full-on X.5(5) trial and Estinien's (intimated) involvement in dealing with Lunar Bahamut would put things closer to a solo duty (typical for X.5(5) patches). Then again, curveballs can be thrown.

... and with the general shakeup of developed content, and Bozja still needing to be accounted for, how things are going to play out is pretty much anyone's guess.