You could be right here.
As for the Naruto comment:
I really don't think he will do much in this fight...Not at least until it's Sasuke/Naruto VS Kaguya. This fight with Madara was really about giving Sasuke the panel time he needed to make up for his abscense in the 1st half of the war. Obito was really Naruto's fight. This Madara fight is all about Sasuke and he will be the key to defeating him and will probably use hashirama's jutsu to do it.
I think Madara is beaten.
I don't really see Madara doing much villain wise after this.
