I think it think the Scabbards should be the ones carrying on Oden's will because first, they know Oden personally while Yamato only knows Oden from what she has seen through his journal and at the execution. Moreover, Yamato even stated that she has to carry on Oden's will because the Scabbards are dead. Now that they are shown to be alive, Yamato's words implies that they are the rightful people to do it.
Not to mention, there is also Momo, the rightful heir of Wano. I think either the Scabbards or Momo makes the most sense.
However, something that I worry is that it might end up with Yamato. Like I find that in One Piece, it's not necessarily the subordinates or their kids of the people who dies that carries on the will. For example, Roger's will is now carried by Luffy instead of Rayleigh, Ace or even Shanks. Dragon's is most likely going to be Sabo and not Luffy. And Oda likes to be 'unpredictable', so while I think it would be dumb, Yamato isn't off the table