Pretty much everything you said about Christian can be applied to CM Punk too. Except that Punk is given much more of a free reign on the mic - Christian can match Punk there if given a chance. Particularly your description of his heel and face personas is exactly like Punk.
Spot on. I could say one advantage Punk has though, is that his personality is more "heelish" than Christian.