nah it is hiyori lol, Oda is not above hiding the obvious
Give an example then. I have never seen Oda hide an already established character over silhouettes, them go into hiding for no reason after healing the scabbards, to do some cryptic shit like lead Orochi around with a Shimasen. Sure, he might be baiting you into thinking it's Hiyori, but I don't think it is.
There is zero narrative reason to hide Hiyori. There is if it's Toki or her ghost due to the fire festival