I always thought they should just leave Civil War, WW Hulk and Planet Hulk out of the movies altogether. They could obviously pull out some elements, like the already established moral differences between Cap' and Stark (Aka the Bruce/Clark dynamic) or the "Hulk is angry and fights everyone", but no need to make those things into entire movies.