I do agree that it's over-done.
Which is why I liked the last Smackdown tapings that I went to. It was the night that Benjamin and Haas, then Team Angle, won the tag team titles. Also that night was that Benoit/Angle TV match after their Royal Rumble encounter...post match, Team Angle (all three) were beating up on Benoit...Edge comes out to NO MUSIC...gets beaten up...then LESNAR comes out to NO MUSIC...and it just seemed to work. Spur of the moment thing and such. And the reaction was still damn good.
EDIT: Oh, and then Edge did the Brock Happy Dance, which gave me a chuckle.