I agree. Sorkin shows are much better when he foregrounds the workplace stories and backgrounds the romance ones. (Which is why The West Wing is the best thing he's written.) Maybe this episode was an acknowledgement of this, and a signal that he's going to put the teenage melodrama to bed.