Part of me thought that but I'd say NO.
He should stay as long as the fans cheer for him over-whelmingly until the big dicks at the top (Vince, HHH) get embarrassed at how badly he's been treated.
He's still getting paid, he's still awesome, why not milk it for everything it's worth?
EDIT: My theory of him leaving was due to frustration at his support not being translated into the proper respect it deserves. Leave, maybe for a year and then return or to create a situation like Punk did in 2011. If he continually gets over-looked, wouldn't be a massive surprise if he had those feelings.