Whatever 123draft says its canon, its canon. We should trust the high authority of canonship.
Seriously now,
I think that ship is long gone. There are arguments that sustain both sides but for me the anime is a retconf*fest and it shouldn't be taken seriously but with a grain of salt. It is just nonsense how in the span of a half a year they basically change everything.
I am sticking with Kodachi writting 'tho (even if its worthy of jumping against a wall), since there is a big dog in SP that decides the route of the anime, i can't remember his name now but essentially one dude decides what happens in the manga and another dude decides what is going on in the anime.