i don't think that naruto will be angry if he sees his father as an edo tensei couz he'll be on his side
and about madara and hashirama now that a fight that will last for ever couz hashirama is an edo tensei that won't die and madara his just so strong right now , thus this fight shall be...