Strange... first Hisui (and Kohaku) hint at the switched twins theory, then Hisui subtly refutes it? I suppose this could be nothing more than Shiki's longing for Hisui manifesting through hallucination, though the mention of Makihisa earlier seems a bit specific for that sort of thing. I have no clue what's actually happening anymore.
Also when the hell did I become Makinasis