Exactly. If Eddie cracks, dropping it to HHH, Shawn, or even Orton makes it a really easy transition. Give Eddie and HHH room, like the iron man, and it's an all timer. He and Shawn is a recipe for one of the potential best matches of Shawn's second run. Hell I think Eddie/Kane could be sneaky good based on Eddie being the cheating scumbag we love and mourn.
Benoit meanwhile blows off the Brock feud and it doesn't hurt Brock any more than the Eddie loss did. There's still a great moment. Benoit/Angle as a story based on the previous Rumble alone is worthy of the spot and a GOAT main event before it happens. JBL isn't just in the right place at the right time and actually can be made to be an upper card guy without the cold push to the top. You get matches with Taker, Show, and could can always pull the trigger on Cena at that point.
So many better options.