I always use "which" for nonrestrictive clauses. For restrictive clauses, I use whichever word is the clearest, with a heavy bias to "that."
_________________________
~ John