What about Orton/Hogan? They could just do Batista/Triple H straight up in the main event, and in the build to WM, have Orton growing frustrated at his inability to capture the belt again. Then Hogan comes in and "rains on his parade" by getting all the attention on him again, so Orton goes into Legend Killer mode again, punks Hogan out, and gets a match with him at WM. This could set up Randy/Batista as a title feud down the line, with Batista playing monster face and Orton the cocky heel who knows his weak points.