Nope, he needs to go to NJPW, lead Bullet Club, stay for a good 3 years, work a few good matches or hell try to main event or co-main event the Dome and that would give him his aura back and the chance to go back to WWE and win the big one again.
Let's be real, he is a far better talent that Cawdy. But yeah, he left too late, a few years ago and he would have wrestled Okada.