The Claremont dynamic was good for its day, but it needs to be shitcanned - completely, utterly and for all time.
Why? It's the X-Men's premise (nor, for that matter, does Morrison's exploration of mutant culture require it to be discarded; there just needs to be enough mutants, something that they're s-l-o-w-l-y working towards. The Fantastic Four are still having weird science adventures, the JLA and the Avengers still do their A-list hero thing.