Is Civil War the right story for Avengers 3?

A year ago it seemed Robert Downey Jr. was slowly exiting the Marvel Cinematic Universe. Now it seems he wants back in and more to him. Reports show that Downey Jr. with Marvel Studios President Kevin Feige have negotiated a way for him to have a hefty presence in "Captain America 3". A role that was initially being written for him in a smaller capacity. This script restructing has led to the comic book storyline Civil War, where Cap and Iron Man go head to head over the Superhero Registration Act. Becoming a serious possibility of being the main plot for the Avengers 3.