Roster/Arena advice

Hi, I’m looking for some advice on my roster.
I’m currently running a Bastila lead Jedi team:
https://swgoh.gg/p/716997717/
I can reach 20th in Arena but have started to drift outwith the top 60 on defence.

Things that are “done”:
—————————————

JTR - Vets finished —> team needs a bit more gear but not much.

7* Chewie —> Using G12 Boba Lead - and G10/11 original BHs with stacked Potency. Pretty much done - will need to move mods around and I’m going to level Greedo to G11 (needs less than 1 piece).


Current Farms
—————————

• T3 in Cantina - then Mission Using 3 refreshes/day
  
• Zaalbar - One 25 node refresh/day
  
• FOST - Both nodes x1 /day
  
• Biggs gear to G12
  
• Chopper and Sabine to G11+ to maxout Phantom
  
• Tie Advanced shards - Ship Node —> need 60 more for 7*
  

Plus I’ve got 1 spare Zeta.....which I could either hoard or put on R2 or Ventress.
Does this look solid? Or am I being wasteful?