If we can't keep moving forward with what already is the first X-Men team, the Comedy Universe version should be Jean,
Storm, Wolverine, Beast, and Iceman. Then during the course of the movie, Rogue and Gambit are encountered and added to the team.
Also have Kitty and Jubes, the prototypical young mutants who get wrapped up in X-stuff, introduced at the same time to compare and contrast.
Have the big bad of the movie be Sinister or Juggs.