I’m about done with the whole “Hajime’s too dense to figure out Jun’s a girl” thing right now, though. I don’t expect that we’ll get a conclusion to that particular plot thread any time soon, but I don’t really want it to become the overwhelming comedic crutch that this particular season leans on.
I suppose the real problem here is that Jun's dilemma regarding Hajime has been done to death by now, and it's really reached the limit of what you can do with this particular story line - A bit of a shame as the entire scenario and the pair's relationship was evolving quite nicely, before being thrust back into the realms of cheap comedy.
I blame Jin Kobayashi. That bastard!
Although certainly Shinbo could've made a clean break with the manga, it's probably not politically feasible. Sponsors would never understand.