There's no fixing him. Rags like The Atlantic have already resigned themselves to the idea that they're voting for his cabinet/administration at this point. You're spot on if you're talking about years ago, say him vs. Paul Ryan in those old debates.

But to say he's a shell of that now would be an insult to shells.