To be honest, no one in particular.
I'd love to see him in some sort of mentor angle with a younger face. Having him motivate someone, say Kaz or Eric Young, into being taken more seriously and actually winning a title would be the best way to use him. That way you can use him in more tag matches and not have his conditioning exposed.