Let's look at it
It would have been great if it was indeed hiyori whom was training in swordmans ship from denjuro and the others in secret.
It would have been great if it was her who had met ace telling him about what had happened in wano which justifies ace responses in saving wano to whitebeard. Hell it would even be perfect since ace would eventually be the one to have replaced her dad's position on whitebearsa crew.
It would been great if it was her who killed orochi
It would have been great if she was the one spreading the truth in wano in secret
Yamato fighting kaido temporarily until Luffy showed up could have been replaced with Zoro.
Yamato holding and running with momo could have been replaced with Sanji doing so further building his bond with momo while giving Sanji more important stuff to do than getting embarrassed by black maria for zero reason