Well, it is a comedy anime after all with not much plot XD. 1st season did have a bunch of anime originals but when they got back to manga material, it was better.
Well, i am really excited to see glorious Athena's arc in the movie (probably the only arc with a serious plot in terms of hayate).