Agreed! The second season is so often when writers either drag in every bizarre plot point they can, or fall into familiar patterns a little too hard -- it's tough to keep the tone right, I'm sure. But I think they've done a great job of just that with FNL. I love the Tyra-Landry plot thread, esp. as Landry's dad's gotten so deeply involved; and the whole Buddy living with Santiago thing is bound to bring some big wrinkles into the show -- I can almost see Buddy showing up on Coach Taylor's doorstep at 4 a.m. right now with "a little problem I've really got under control, but if you wouldn't mind ..."
Loved the Smash focus of Friday's ep, too. I love the interplay between his Mom and him. No way I'd ever cross Mrs. Williams!