They should just redesign the questline similar to how 5.0 does it. Dungeon with boss and finale into instance with next boss.

A lot of those fights aren't even needed, they can just rework them into small cutscenes showing your character and Cid or whomever is assisting taking them out real quick.

What I stated previously is the best way.

Now there's the lazy way and that would be adding trusts to these content as a bandaid fix. Either way, 2.0 is showing clear signs of aging every passing expansion and I'd prefer the former than the latter.