Personally, I think it'd be way more impactful if it was Matsui that got the receiving end instead of that guy; it would set up a bigger role for him at least, and besides I'm more attached to Matsui than given that he's one of the few unironically likeable characters in the series in spite of him being more chummy with Naoko.