Continue farming characters in cantina or mods?

Go for Aayla, but afterwards you should start farming mods.

You also should get Anakin

once you get your arena team to a level your comfortable with then farm toons in the mean time mods.
I have a guildmate that has a lot of 7* characters but barely any mods. He can't use his toons effectively because of this.