For my team, I'm going to keep the basic structure of it with one small alteration.
Combat team:
Storm
Gambit
Emma Frost
Warpath
Manifold or Nightcrawler
Non-combat team who help with tech, cooridination, and medical stuff at the mansion:
Forge
Sage
Beast
Cecilia Reyes