Looking at your roster your biggest mistake is ZFinn without a resistance team.
It is not a mistake to z Yoda.
And you have a team that can currently serve you well in Grand Arena defense with him. Just make sure your Jedi have a total of 80 tenacity when attacking Empire teams see your Jedi, cause that is whom they'll use. 80 tenacity should be enough for your team to get nice turn meter when you resist dots from Garmin, Vader, and Palpatine.
Yes, Bastilla is your best Jedi leader. But you have a team you can use right now for GA defense. Your oppone t will have to bring a good team to beat a zYoda led high tenacity Jedi team. They will burn 1 good squad even if they will .
Also, your FO team is great! That's your arena.
I have a high tenacity nonZeta Yoda led Mace, Ahsoka Tano, JC, Plo, and it serves me very well as an off team that all have ships! They are currently around G10, and can get to stage 6 of combat missions in Territory War. I love seeing all the resists.