Your empire team is quite ready fir r2d2, you might need a few resets for good rng but that is how palp rolls.
As for your rebel team, I personally would say to keep going with it but replace boba with old Ben. Wiggs can oneshot anyone provided they survive long enough. I ussualy avoid chaze teams in arena because I do not have a reliable taunt dispeller and if you cannot get to wedge fast enough he can beat you on auto. Vader always starts with force crush which will give your wiggs a step up. But the most important thing is MODA. I suggest you stop all cantina related activities and focus on mods. You need at least 5 speed arrows and at least speed secondaries for wedge. I am on phone so I will write more after the weekends. Once again, ALL IN ON MODS