I think the core issue with decision-making here is that we need to give this foe--Goshikuro--a personality. I was thinking that Yoko worked with him for heists in the past, but his sadistic tendencies were unsavory, even for Yoko. So he wanted to end their partnership, Goshi didn't like it, they fought, Yoko came out on top in the end, injured but alive. Goshi survived and you know the rest from there.

Let's get this guy a little fleshed out before we make the choices.