P2 HAAT

I'm struggling with getting my roster up to par for the HAAT raid. I'm guilty of spreading myself thin currently, so I need to focus. I'm nearly ready to use the Akbar (L), CLS, Ventress, Thrawn, BB8 squad however not until the BB8 event rolls around again so I can 7* him.

With that in mind, where should I be focusing my attention?

My SWGOH.GG account is: https://swgoh.gg/u/joshymac/

Any help for HAAT in general is also appreciated.

Thanks for your help.