But they definitely do a lot of genre play, and recent interviews with the showrunners indicate that it's completely intentional, and unlikely to change any time soon.

It's certainly intentional, I just wish they'd keep their hands on the wheel instead of following every inane impulse that crosses their mind.

As for changing, well — the show is going to end after next season, so there's a very definite change.