Neither, honestly. It's One Piece. Kills happen 'whenever Oda feels like the plot needs it right now.' The real embarrassment was when Oda completely dropped and altered their character arcs. Both characters needed at least 5 to 10 more chapters to delve into their history with Rocks and provide a satisfying conclusion. For some inexplicable reason, Oda decided to conclude Wano with around 20 unresolved plotlines. I'll go to my grave believing that Yamato was definitely going to join the crew until Oda had a last-minute change of heart. Only Momonosuke's heritage arc was given a satisfying payoff. Heck, it's the only arc that was even given a legitimate pay off at all.
/end rant