If you think about it, Thriller Bark is basically what Wano should have been.
Strawhats vs Oars = Kaido vs Scabbards except that the Strawhats should fight Kaido instead.
Nightmare Luffy = G5 Luffy.
Zoro vs Ryuma = Zoro vs King.
Zoro getting Shusui = Zoro should have make Enma black after beating King.
Zoro taking Luffy's pain = Zoro indirectly outshines Luffy but it doesn't hurt Luffy's portrayal as he is still the one that finished off Oars, so in Wano, it would be Zoro killing Kaido after Luffy beats Kaido.
Zoro making a grave for Yubashiri = Zoro visiting Ryuma's grave.
Etc.