I say switch Jericho, Cena for HHH and Edge. Then we can have a HBK v Edge feud, Jericho v Undertaker feud, HHH v JBL feud, Cena v Kozlov feud...
The more I think about this, the more I like it. As far as I can remember, we have never seen any of these feuds before, with the exception of HBK/Edge back when DX was feuding with Rated RKO. That's one worry I would have here, is that those two groups would just reunite and pick up where they left off. We do not need another DX/Rated RKO feud.
The only other concern I would have with this is the potential for Edge to lose some of his heat in this switch. While Edge is great at playing the heel, he draws tremendous heat from his association with Vickie. All he has to do is walk out to the ramp beside her to draw huge heat. While he is good enough to get the heat without her, why break up a pair that is still working as well as they do?