I'm not sure if I really liked the recent episode, 6x06. Usually, the show is pretty good at following a more unified storyline or at least keeping to two good storylines, but I felt like tonight's episode was all over the place.
I think they just tried to put too many things together. I really wished that they had focused on Haley and Jaime. Even though it's two weeks later, I would expect them to still have issues about being attacked by a crazy sociopath. Also, I was kind of annoyed that Nathan was still focused on playing ball. I know everyone is supposed to move on, but I would think that he'd at least put off everything for a bit longer than 2 weeks to watch over his family.
I also think that they really rushed the whole issue with Peyton and her dad. There was such a gradual build up and suddenly he's gone? Over all, I wish that they had split this episode into 3 separate ones. I know it's not possible, but it would've have been a little better if tonight's episode focused on Haley, Nathan, Jaime, then the next one could focus on Peyton and Luke, and then a completely separate one to focus more on Brooke and Sam.