Yeah, could be the case, but they change direction so often i don't know anymore.
It has two options in my mind:
Sanji goes there and fight Jack since it's probably Hiyori taking care of the scabbards and he'll protect her.
Yamato goes there to fight Jack, since, once again, it's probably Hiyori taking care of the scabbards and momo have yet to meet his sister.