sorry.. not a follower of manga..
but madara-madara , tobi-madara?
are there two of them now? :O
In the Manga, it's been revealed that Tobi is not Madara.
We still don't know exactly who or what Tobi is.
Uchiha Madara, as it turns out, lived through The Battle of The End and died sometime after wards.
We know this because Kabuto uses Edo Tensei to resurrect Uchiha Madara, and a person cannot be dead and living at the same time.
Now... I'm leaving out the best spoilerific stuff. Kabuto heavily hints that Madara Uchiha is one of his Edo's long before he resurrects him, so... there's plenty of reasons to keep reading.
As for the OP's question:
I think they probably will team up. It'd provide a basis for a reconciliation of sorts, and Kishi has hinted in some of his interviews that he doesn't want to make his fan base angry, and that there does seem to be a rift between Sasuke fans and Naruto fans... which isn't news to peeps here on the base.
So.... good prediction. We'll see how it all pans out.