Go with whatever sounds right. Fowler's Modern English Usage says something like the language would be a lot tidier if 'which' were used for restrictive and 'that' for non-restrictive clauses, but the fact is the language is not tidy.

Since Fowler's day, some people have tried to impose this system on the rest of us, but they haven't succeeded. File it with split infinitives and ending sentences with prepositions as one of those things the linguistically insecure get upset about for no real reason.

Bingley

Bingley