Rebalancing between big projects is good. Even moreso when you are so far out of balance.
I wouldn't worry about Triumvirate for Geos - your Vader can likely solo any you encounter. They might be a cheap-ish general purpose option though
Padme, Ahsoka, Ani, GK, Qui Gon gets you a functional GR squad.
JKR, Jolee, Basty, GMY, Hoda gets you a decent Jedi squad.
And you can trade Qui Gon and Ani for GMY and Hoda if you want to use Qui Gon's omi. Both squads still very usable.
CLS, Han, Chewie, Threepio, Chewpio for a strong Rebel heroes squad.
Got a lot of gearing to do. You might want to set g11 as tour initial target with 1 or 2 key members from each squad getting g12 then work them up to g12/g13 later.
Imp Troopers (both Veers and Iden squads), Nightsisters, MoMo Rebels and Geos can all punch up fairly well while under-geared. Worth a thought for filler squads.
Wampa needs relics and omicron but is a true beast in GAC. A one-toon squad.