It should have been done like this. Maybe Jericho gets a curve ball. Instead Snuka, Steamboat, and Piper go out to find talent that they are going to pit Jericho against. Basically, take talent from WWE territories for call ups.
Snuka could ask his son. That angle could have been nice to see some kind of build between Snuka, and his son. Would also explain why Sim didn't come out to save his father from Y2J. Perhaps Sim, and Jimmy don't have a strong relationship. Maybe have a thing where Snuka would be trying his hardest to get his son to come, and fight at WM25 for him. Finally he comes around, and does. Could have been a nice small angle that could have worked out well.
Piper does his infamous last Piper's Pit, and says he did some searching in his home country, and found the future of the WWE through Scotland. Piper tells the WWE world to give a warm welcome to Scotland's very own Drew McIntyre. I'm sure he would draw a pop if their is enough build, and emotion from Piper which he has always been a natural at. Huge promo, and possibly a great way to introduce him to the WWE world.
Then their is Steamboat's pick. It took some time to figure out who I would have him pick. Out of nowhere it just came to me. This would have to be the easiest pick of them all. The Perfect pick would be Joe Hennig. Hennig is ready for the call up to the WWE, and this wouldn't have been a bad idea. Steamboat has no direct relatinship other than he probably knew his father, but thats it. He is just the next generation of stars that are insulted with Jericho's actions.
This match would be an elimination match, and some squash. Jericho ofcourse would be the winner. Maybe Jericho rolls up Joe Hennig after he is caught looking down the aisle at Teddy, and Cody Rhodes staring at him. Then after he is pinned, they laugh, shake their heads, flail their arms in disgust, and turn away. Next, would be Sim Snuka. Another solid match with Sim nailing Jericho with what looks to be a new devastating finisher that may lead to a 1-2-3. However Sim looks to his father, and points up. Does his father's signature hand gestuer, and kneel down.
Jericho slowly gaining back from the move previously. Sim takes his time getting to the top climbing the turnbuckle. Chris gets up, and delivers the Code Breaker from the top rope, and for the pin. Finally leaving Drew McIntyre. A solid 15 minute match goes on with several near pins. In the End the lights go out, and the music of Sheamus O' Shaunessy hits. A huge Irish beast comes from the entrance holding a beaten Roddy Piper in his hands. Drew's attention is driven away from Jericho who seizes the opportunity to capitalize the moment. This time Codebreaker with the Walls of Jericho tapping him out.