Seems a bit like this is the best that we're going to get for any version of Angel, that they'll leave him at some halfway house afterwards or if the real Warren does return that he won't have his wings so he won't be on the team...there's filler issues in every arc, maybe it seemed like a filler issue because Magneto didn't dominate everything as he seems to do lately with Bunn's writing...