Of course they are stuck like this for the entire next arc. Good to see one question answered, with Tachibana getting charmed at the sight of Jinguuji. But that he starts to pet Jinguuji instead is adorable.
I look forward to the shenanigans the newly swapped duo will encounter.