No, I do not think Kishi intend to set up a match between Edo-Madara and Naruto. I think Kishi intents to put Naruto and Sasuke in an epic and final battle. Their destiny are intertwined to repeat the similar fate between Hashirama Senju and Madara Uchiha and their ancestors in between the elder brother and younger brother.