Thor 3 (in my unfounded opinion) will be about the fall of Asgard under the command of Loki, still disguised as Odin. This of course will tie into the Infinity war storyline. Civil War will be scaled down in Cap 3; no New Warriors, no spider-man confession, no negative zone prison and no clone Thor. There are so few heroes in MCU and most of their identities are already known. The conflict will be about accountability for damages that occur during these epic superhero battles.