I don't believe Madara was ever part of his plans. Remember, Nagato said Rinne Tensei couldn't be used on the recently deceased so it never would've been able to bring him back. Otherwise he'd have brought back Jiraya or Yahiko before that. The plans were likely Madara's, but his reality would be a lot darker. I doubt Madara overriding the Edo Tensei was something Obito had planned for especially since he didn't know how to use the jutsu himself.
R.I.P. City of Heroes
You will be missed.