I think Marvel will make it sure that he will comeback for Avengers 3. And if Joss Whedon spent 7 years of his life working for his TV show Buffy. I don't see how its harder for him to release an Avengers movie in every 3 years. He's not even doing all the work like writing/directing for the other MCU films, And he and Marvel usually plan things way ahead of time.