If you make those changes, I'd go over to Marvel. Pheonix could probably kill everyone on all the teams all by herself (don't quote me on that...but she's wicked powerful). Xavier, Magneto, Hulk, and Ironman (depending on armor type) all could be considered powerhouses...a rather sizable swing would occur with them in the lineup.
-DM