Agree with those who have said King should be the one to step down, not Striker. On the topic of CM Punk, as much as I want to see him back in the ring, I'll be sad to see him leave commentary.
They should have him commentate all matches other than his own, and he should be mic'ed while in the ring.