Even so, I think that quote gave Kabuto more motivation which is why I think he will learn to control it. At least I hope so.I'd prefer it to be Kabuto as well, but I suppose we have to wait until Kishi breaks the news haha. It would go along with the "Young generation overtaking the old theme" well.
Oh, and that last point, wasn't that when Kabuto was only partially taken over? As far as I am aware Naruto and the current form of Kabuto haven't had any contact?