The episode that comes to mind is A Deadly State Of Mind. George Hamilton plays the psychiatrist murderer who is having an affair with his own patient and murders the husband in a scuffle in the house.
I don't get to see Columbo much anymore since Bravo took it off the air. It's only on Saturday afternoon now.........oh well. Hope this helps.