Has WWE screwed up Bret's return

I'm kind of disappointed. I understand that they want to give Bret an excuse as to why he may come off limp or limited in a match/ fight against McMahon, but the mysterious car accident is about as played out as Mae Young jokes.

Wouldn't it have been better if Vince came out, showed Goldberg's kick, and then taunt Bret about the stroke etc... Have him do it every week culminating into a comment about Stew. Then have Bret get so pissed and say that he'll kick the hell out of McMahon at Wrestlemania or die trying. I think that's so much better than Bret's third farewell and the kayfabe broken leg/ torn ligament bullshit. I kinda expect Rikishi to be the mystery driver again the way this angle is going