HBK by miles.
I find it quite frustrating that people say HBK "wasn't a draw." The man's prime came when Vince's ability to market his product was in the shitter. Then he got an awful back injury just at the moment the Attitude Era is getting rolling as a mainstream attraction. By the time he came back in 2002, Vince was hitting another commercial slump.
Making it even worse for Shawn was, although he certainly was an asshole in the '90s, no wrestler was in Vince's ear harder about modernizing the product. His fate was almost a cruel joke.