How to fix The Last Of Us Part 2's story

While the game has issues I believe it can be all fixed by a little restructuring ala Beyond Two Souls. The game could be far more shocking and surprising and yet it misses that chance not just because of leaks. But by not structuring it well.