I'm sorry, I haven't really seen many episodes of The Closer, so I'm not much help on this topic.
For your second question, are you sure it was a witness? One possibility for that is Fatal Retraction of The Closer, Season 1, but in that case it's a woman who was believed to be a victim of a previous murder who later turns up dead elsewhere.
Sorry I can't be more help.