I believe it will carry on from the war to Madara Uchiha. Kishi said he has no weaknesses. I can't imagine him just having an early end. An arc featuring Madara...I don't know how it will play out, but still.
I can totally see Kurama in control of Naruto's body as the full-fledged Fox...