Love this topic. Thought about it for 23 years now.
I would have kept Flair as champion until the Rumble where he drops the title to Bret. Savage wins the Rumble, setting up a face-vs-face WM main event for the title. Throughout the buildup, Savage slowly heels it until the match (much like Piper-Bret).
Hogan comes in for WrestleMania and loses to Yokozuna, setting up rematches for the European tour.
I'd try to keep Flair happy so he sticks around until WM (maybe a nice payday or something) to lose the feud to Curt on the grand stage. Hennig with a big win like that at Mania would be catapulted to main event status.
Steiners should win the belts from Money Inc. at Mania and I'd put the Nastys into a Street Fight with the Samoans for a little variety.
Not sure what Marty Jannetty's issue was around Mania in '93 but man it would've been great to see the Rockers explode at Mania, with Luna and Sherri in their corners as was planned. If not, I guess Tatanka will do.
Honestly at this point I don't think it matters who the Untertaker's opponent is. The match with Gonzalez was awful on every level but anyone else you stick in there would be terrible too.