Looks like Magus is coming. Any doubts that Fox owned Adam Warlock and Vision was replacing him are put to rest.
It also looks like Infinity War Part 1 is going to be against Thanos and 2 is against the Magus. If things weren't going that way, then there would be no chance that Black Panther would be able to have a sequel since Infinity War: Part 1 would have killed him and all the other Avengers off as a cliffhanger. Clearly the curbstomp is going to be the beginning of the third act in Part 1.
Also, looks like I was right about Adam Warlock being part of Guardians 2 since Magus is being cast. Warlock is a key member of the Guardians and the Soul Gem needs to debut before Part 1 hits.
My guess is that when Infinity war Part 1 starts, here's where the gems will be.
Space - Ruins of Asgard (Asgard)
Mind - Avengers Tower (Earth)
Power - Nova HQ (Xandar)
Reality - Collector (Nowhere)
Soul - Milano (Could be anywhere)
Time - Hel
My guess is that when Thanos kills off half the universe, he'll have managed to wipe out the Avengers entirely (and he kind of needs to kill Vision at the beginning or else he'll never get the Mind Gem) and we'll get an entirely new team which follows the same character archetypes as the AoU and Civil War teams.
Captain America - Winter Soldier
Iron Man - War Machine
Thor - Doctor Strange
Hulk - Luke Cage
Black Widow- Mockingbird
Hawkeye - Falcon
Black Panther - Spider-Man
Vision - Ant-Man
Scarlet Witch - Wasp
Nick Fury - Maria Hill
IMO, killing off most of the Avengers early on is a good substitute for killing off the Fantastic Four and all but two X-Men since Marvel lacks the rights to those characters. Having Luke Cage lose the other Defenders (Daredevil, Elektra, Iron Fist, Jessica Jones, Hellcat, Misty Knight and Coleen Wing, also Shang Chi if he appears) along with Danielle Cage gives him some real motivation to get vengeance on Thanos.
Also, Pip the Troll is most likely going to be replaced with Rocket Raccoon since I don't see Rocket showing up and Marvel don't own the rights to Silver Surfer so Star Lord is filling his slot.
I also feel like we won't see Death in Infinity War but we'll see her in Doctor Strange. Hear me out, I expect Phylla-Vell to become Death's physical avatar.
Doctor Doom absolutely won't be in Infinity War part 1 but his role will probably be filled by Kingpin or Zemo.
Infinity War: Part 2 will be all hands on deck with not just the Part 1 team of Avengers and the Guardians but also the AoU and Civil War rosters and the Defenders.
Also, so happy to know that Warlock and Magus aren't owned by Fox.