What's next for Yamato's Oni Pilgrimage?

>Meeting Onimaru on Bandit's Bridge on her way from Ringo to Flower Capital

>Once back she either:
* Eventually sees Pluton buried under Mt. Fuji with Momo's Grandpa's help. Just a silhouette for us though. Remember. this is Oda after all.

* Does something sexy right before a disaster.

* That disaster being this: Blackbeard attacks Wano in a bid for Pluton after Caribou informs him. Yamato struggles to defend. Her fate is unknown.