Cody/Punk could weave some "shoot" elements in, with Cody pointing out that Punk felt threatened by his friends and Punk saying something like "Cody, all your friends are losers."
Any iteration of Cody/Roman would be disappointing. Not because of my personal takes on them (literally thought they were the least interesting parts of either night this past WM), but because running the same ME three years in a row is just admitting that you don't know how to make stars.
Personally? Take the restraints off KO. Spend the next three months building KO back up as a violent force of nature, he somehow wins the Rumble, and then spend all of Feb/March having KO try to break Cody mentally. Cut them loose at WM and watch KO fucking kill himself to get his WM main event over as an all-time classic while Cody goes full-on Stinger by overcoming the odds.
Shit, there's your skeleton for the program. Cody is Sting, KO is Cactus.