What to do now?

Ever since the Ep/vader buff my phoenix squad has been struggling and i am getting pushed farther and farther down the ranks. I am at a crossroads now as I do not know if i should go for a empire team with ep, vader, tfp, tarkin and some tank, or a wiggs team with old ben, r2 5*, and possibly ezra. And if i do go with the empire team which I am leaning towards, what tank should i use with it, 7* storm, 7*KRU, or a 3* sion. Also a side note, would a gear 8 phoenix squad with a gear 9 ezra (no omegas on anyone)with alright mods be enough for 7* thrawn? and if not, who else should i take to gear 9 first?This is my Swgoh GG:
swgoh.gg/u/dirtymongol/collection/