There’s actually a really simple fix.
You get the same moment as before. Star-Lord realizes Thanos killed Gamora. He comes *thisclose* to ruining the plan...then stops himself. He made a promise to Gamora to do what was necessary to make sure this was done right. So he foregoes his revenge. The gauntlet is about to…