Well, you could just push ahead the storyline. I did it for Kei'taro, so that despite being in multiple bouts, it wasn't a 'same time' deal. xD