Nah. leave Civil War for a forth or fith season. There are still many "classic" Avengers tales they could adapt: The Celestial Madonna, The Serpent Crown saga, Assault on Olympus, The Exemplars, The Morgan Conquest, The Gatherers Saga, maybe even The Crossing (a chance to get it right?), before they get to Civil War.
I really don't like the Unity Squad idea. I think it's so stupid. For me, Marvel has basically killed any enthusiasm I could have had for the X-books (and there were many characters there I REALLY enjoyed. Too bad they've become unrecognizable). So, I'm happy with them not crossing paths with the Avengers very often.
Peace