To be fair, other than the Figure Four and short angle with Flair they haven't given him anything to do as a face. Which is, of course, vintage WWE booking.
He was a wack heel for most of his run because he carries himself like a secondary villain in a high school romantic comedy and that never changed. It screamed 3MB-esque jobber rather than true douchebag.