One thing they could do to improve it, by Andrew's standards, I am guessing, is separating their prestige from their actual in-ring stats. Like in Smackdown: Shut Your Mouth, you had a ranking system to decide how over your worker was, all the while still maintaining a separate in-ring attribute set. So HHH might be a god in the rankings, but people below him would be the better athletes.