That's nice and everything, but really gets away from the source material a little too much, I would make the following changes based on contracts that we know are out there and what's likely to happen:
*****Some spoilers from comics*********
In the Civil War storyline, and one that I think is likely to be kept, Captain America is the one who is killed, not Tony. One of the great moments from that comic series is when Tony Stark sits next to Cap's dead body, confessing his regret for everything that has happened, it would be great to see the RDJ Tony Stark to have that scene. Plus, Chris Evans only has one movie left, I think that movie will be Infinity Wars Part 2.
There are two gems that have yet to be found, the Time Gem and the Soul Gem, the Soul Gem (or stone, I guess) is with Adam Warlock, who has been teased twice in the movies, and I think is likely Peter Quill's father in the Guardians of the Galaxy movies (since they've made it clear it will not be his father from the comics, unless they are trying to hide the truth), so I expect Adam Warlock, along with the Soul Gem, to be introduced in GotG 2.
I like the idea of Wakanda having a gem, and I think it will be the Time Gem. In the comic series, the Time Gem is used to bring back Captain America, I think this will likely happen at the end of Infinity Wars Part 1.
As far as Captain Marvel and the Inhumans go, I think they will play a very large part in the circumstances of the cosmic realm with the ongoings of the Infinity Wars (Kevin Feige has said that those movies will take place within that timeline.) I think it's hard to predict how exactly that will work, but we will see.
*****End Comic Spoilers********
I trust Marvel regardless though, it's not like they couldn't switch some things up.