Squad advice

Hello

Looking for a new arena team, since my currently squad is not that great anymore. I can still get in top 200, but sometimes a struggle. Running a Finn - r2d2- resistance trooper - poe - resistance pilot/han solo
Also got a trooper squad, but sucks for arena

Here is my swgoh link, https://swgoh.gg/u/gansaru/collection/