I would throw in Savage and Ricky The Dragon Steamboat.

ECW's Sabu had some wonderful rivalries with names like Terry Funk, The Sandman, and of course Rob Van Dam.

Jimmy Valiant vs Paul Jones and his army

Hulk Hogan and Sting.

Raven vs Sandman from ECW. Arguably one of the darkest and emotional rivalries of all time.

Raven was a grade-A villain. Just ask Tommy Dreamer.

Legion of Doom and New Age Outlaws.