This is my take on Habsrule's card, along with some thoughts. I like the way that he set it up for the most part and quoipourquoi did a good job as well. I thought of doing something with McMahon and his WWE guys vs Cueto and his Lucha guys, but the numbers were too skewed. This is a rough order, I didn't really consider match order too much.
Jericho vs Okada (Iron Man): Probably the best main event here, doesn't need to change.
Christian vs Cole w. Orton: I am a big Christian fan and he is especially valuable because he is a great face, while most great wrestlers are far better as heels. Christian vs Cole is for the IC type belt. Cole is a bit lacking physically so he gets Orton as his bodyguard to add some menace, and I don't like Orton as an actual wrestler anyway.
Matanza w. Cueto vs Bundy: Same as in the original, it looks good to me.
Jeff Hardy vs Matt Hardy vs Snuka vs Shane McMahon (Ladder): It's difficult to build around the Hardys as a tag team because there isn't really another team that should be viewed as on their level. This puts them as singles wrestlers, they are feuding (Matt is V1 Matt, the best Matt) and Snuka is a good fit for a ladder match, plus the novelty is that he never did one before. McMahon gets thrown in because he can do spots, and though I hate him in matches he can be hidden with three other guys in the match.
Bulldog vs Lashley: Power fest, but it has to be young Bulldog so that there is some movement in the match
Strongbow and Jinder Mahal vs Angelico and Son of Havoc vs Helms and Dillinger: I really like the Perfect Storm tag team. Angelico and Son of Havoc are faces as far as I know, which makes for seemingly two face tag teams. That's probably not ideal but I couldn't find the space for a second tag match (though I did consider Vampiro and Doink as a tag team that was basically the nghtmare of children everywhere). Strongbow and Jinder are basically anchors in my eyes with limited value, so I put them together as reformed but unapologetic "Indians" who admit that they were frauds but would do it again if they could. Strongbow was of Italian ancestry and Mahal is Canadian. Stylistically one powerhouse team and two speedy teams could work, but this admittedly isn't an ideal match.
Pentagon vs Blackman vs Vampiro vs Doink (Hardcore): Pentagon and Vampiro make sense as hardcore guys. I've seen Matt Borne (Doink) in a somewhat hardcore match (there was decent blood anyway) and Doink could be menacing. I would consider using his "Borne Again" ECW gimmick. Blackman is here because he has to be somewhere, and it could be funny if this serious guy was thrown into a hardcore bloodbath with three crazy characters. He also had the longest reign as WWF Hardcore Champion, so there's that "prestige" in play.
Goldust vs Joey Ryan: Just a ridiculous match. I really liked the Golden Deletion though. I would make this something like Goldust calls Ryan on his ridiculous sexual stuff and takes it to a new, uncomfortable level that has Ryan actually demurring.
As a minor point, I would have preferred Wahoo McDaniel to Chief Jay Strongbow if a native gimmick was needed. McDaniel was by most accounts quite good, but Strongbow wasn't.