Not really. Joyboy and Roger did not defeat the WG. Joyboy likely lost before the Void Century. Roger was too early.
Luffy dying in the EoS after everything ends (and his last fight) is very much in line with a young pirate like him coming through like a storm and staving the world in his wake.
The way Luffy survives is his crew, his living wills. This is how I prefer to interpret where the story is going until we know more.
You are talking to to someone who believes the story will end exactly how it began though, Luffy and Shanks, returning the hat (this is based on huge theories with Shanks and his motivations, wont get into this now). One last major fight between them that in the end, even if Luffy wins, may end up killing him by the end of the story.
All I'm saying is to wait and see what consequences arise from this "heartbeat" reviving him repeatedly. It's done it already twice, just wait a another month or 2 until the fight is over and we know what happens to him