HBK vs.
Kurt Angle
Just as good in the ring, much better on the mic, better heel, better face (despite not being that great), and when all is said and done will probably end up having had a bigger impact on the sport when people look back in 100 years time due to his amateur career and olympic gold medal.
Edit - actually, on second thoughts, both would get wafflecrushed in 100 years time by whoever the current flavour of the month was