actually he is. He said he would finish the things he said he would and then he is going full time on jinn
From what I have read anyway
Well, there are quite a few things that he promised to finish, so it's likely he'll stick around for a year or two, considering Jinn is connected to NXT per his words.