Strong enough for JTR

Just trying to get some feeling as to whether i should strengthen my team for JTR a bit more or not? (obviously still need to 7* bb8 but that wont be an issue when it comes around)

http://swgoh.gg/u/rahl2/squads/83150/

thanks for the insight