Because S2 starts where you said it was, the beginning would have been the same, call it an S2 if you want to, i will personally keep calling it a correction of what should have been in S1.
Although Yeah, S1 was pretty brilliant when it comes to comedy, but it did lack development of characters. And when it did have some, it wasn't finished, or Hayate got beaten by someone for peeping.