You’re right but what why would toki do it
She was probably forced to do so
anyway I think the character who saved the scabbards earlier was her
and I think somehow Black Maria have a hand in all of this based on her speech " two people will finally meet today"
am rather confident in Shiki appearance however, since there's no way the old hag is the Mastermind behind everything
She knew exactly what to say to Kaido to make him accept the alliance, her ties to Shiki explain everything imo