la squadra didnt even have to die if bucciarati and giorno told them their plans.

Diavolo isn't there.

All is as it should be. Jokes aside, there's actually quite a bit of detail on this (spoilers ahead):

Polnareff will "live on" in the turtle.
Diavolo technically never really reaches death.