I’ve moved your post to this big thread because people regularly open new threads about team building that the forum becomes covered in them unless we put them in one place.
For both PvE and PvP, evolving Novadrake (6th slot along the top) will make a big difference.
Looking at your collection there, I’d probably build something like this…
Not sure how much team cost you have or where to fit Ammityrant into it but you probably do want to use it somewhere.