I feel like most of Makoto's fight is quite boring

Ss1 was good because he actually struggled because of Sofia's relentless attacks and he's not used to fighting, but in ss2, I feel like they talked most of the time and Makoto just absolutely destroyed Sofia. I do hope he gets put in a situation with real stakes where he actually has to struggle to find his way out of it, like his students or like Hibiki.