You aren't wrong on, like, any level. You can even do a take on the "HBK signs Benoit's contract" angle where Eddie steals HBK's contract, or something.
In hindsight, we get better matches at WM20, as well. Eddie/Angle was very good, but Benoit/Angle had already proven time and again for the last 4 years to be the best match the company could've put on. Without the 2007 tragedy, the Benoit/HHH/HBK match was already great, but I really think Eddie in it would have made it much more entertaining minute-by-minute, and it opens up a finish that could've easily built into the Backlash rematch that happened anyway: HBK knocks HHH with Sweet Chin Music but Eddie breaks the cover with a Frog Splash before getting the win, or HHH with a Pedigree into the Frog Splash spot.