My guess is that Gotou's reaction to Shigechi has less to do with being a masochist and more about responding to what he sees as her genuine opinion of him, after Agawa broke Gotou's confidence and sense of self.
The shift in Agawa's behavior is interesting.
Thanks for the translation.