Wouldn't it be better to ask this question during, or after his battle with Naruto? He's yet to reveal the aces in his sleeve. The best you could hope for now is sensible speculation, which really isn't worth much at this point.
But we have no idea how far away that is. We could have a kubo situation where it gets put off for months. I think there's interesting discussion to be had based on what we know right now.