More Stephen Holder Please!!!

Hi! Finished The Killing and love Stephen Holder. I am SO sad I won't see my characters anymore. :(

I am looking for a serious mystery show with a charming, warm, and goofy character who adds levity to every scene but obviously is dealing with a lot.

Must have: -Cute, goofy person working with a more serious person -Building romance

Must not be: -Period piece -More than 6 seasons -Be an anthology

Thank you so much!!