WM 25 - HBK vs Taker or JBL vs Taker?

Shawn Michaels Vs The Undertaker (The Showstopper and the Undefeated Phenom) one on one at the 25th Aniverrsiry of Wrestlemainia is the main event that is yet to happen (UNTIL NOW) I think Shawn Michaels will defeat JBL on RAW and then end the 10 month undefeated streak of Vladmir Koslov on Smackdown and challenge "The Deadman" at Wrestlemainia 25