You have an excellent Wind team. There's no reason to throw that away. There will be another Wind event SSR eidolon available eventually.

The failure to prioritize Souls properly can be fixed with farming and time. I'd pick up Mordred > D'art > Joan.

Make sure you farm Vine, as that'll greatly improve your damage. Also look up the materials to Awaken Gaia and start collecting those.

It should be noted that picking up SSR Cybele with a Miracle ticket would greatly improve your Wind team.