ya hes def still edo thats why he keeps going on about rinne tensei cause he wants his natural body back, which baffles me since he has unlimited chakra and mokutan.
He is not complaining about his edo body. He is only confused about why he was summoned through edo tensei and he thought it was Obito's doing and it was the latter's plan which is not. Kabuto just summoned Madara first and beat Obito to it.
The actual plan was to summon him with Rinne tensei as an old man just the way before he died so it is natural that he'll be confused and he keeps thinking that there is a reason why Obito, which Madara believes the as one who summoned him as an Edo, but actually is not, summoned him as an edo in his prime.
If you and your colleagues in a project had a well-laid plan and the day comes when your group is about to execute the plan but there was sudden changes you were not informed of because you think it is the doing of your hasty colleagues, you'll get confused and a little bit pissed off too, right?