Ooh, that’s a tough one. I’m sort of leaning to the latter, because I could see Magneto as an antagonist working after his New Mutants phase, but it could have been done somewhat more intelligently and more impactful.
Whereas the Shadow King thing always smacked a bit much of Claremont trying to wrap things up too neatly.