We can squeeze the fluff in, right after the exams. 
And, I believe that the really big fights occur during the Summer Camp arc.