Yep.
I also think he needs to fully accept the mistakes that he (or Nix before him) have made, cut his losses, and move on; no GM is perfect, but the best one's are able to do that. He's done that a few times (eg. Chris Williams), let's see what he finally does with EJ.