i agree with kyouji and soutaro as a pair, but in original both of them still the part hiroyuki friends (especially kyouji, he's hiroyuki childhood friends after all). You just need to make sure they still included so both of them not left behind the scene.