I felt this restored things to status quo a bit too handily, but I guess it's the nature of this show to be episodic and driven by the case of the week. And at least they came up with a somewhat credible contrivance for putting off the romance a while longer.
That's pretty much the was I saw it. The show's popularity was built upon the brilliant interaction between the characters, bolstered by an excellent cast chemistry. While I like it when shows try different things, I also don't know that it'd help this show to deviate from what works best. Given that, I think they handled it all about right.