Here’s my take on the plot for Endgame:
The Avengers gain control over the “time Stone” and reverse all the effects from Thanos destroying half of the universe.
That’s likely what’ll happen.
But what they WANT to happen is.....
Brie Larson takes the infinity gauntlet, reconfigures it, and snaps her fingers.
All white hetero men turn to dust.
(You just know they dream of it)
That was pretty much the plot in the original 6 issues of "The Infinity Wars". Victory was never about stopping Thanos from getting the stones, it was about getting them back from him. In the Doctor Strange movie, they followed the plot of the original encounter between Dr. Strange and The Dread Dormamu, yet they gave it a different twist to accomplish the same result. (Nicely done, I might add.) I suspect that this will be the case with Thanos, as you said. I also suspect that Captain Marvel will play some key role it this, which is fine, as long as they stay away from any preachy feminist crap and just have her out there kicking ass. (Maybe something a little steamy with Thor would be okay.)