X-Men, yes!
For on screen super teams, Bobby and Xavier showcase more diversity than MCU Avengers right there.
There are so many mutants to choose from and showcase, it would not be hard to be more inclusive.
And given the X-Men fanbase, I sure as hell hope they are inclusive of non-traditional characters and the representation that wold bring to the big screen.