Is there really meant to be a that that in one of your examples? (If so, it lost me completely, and now I'm trying not to recall the entire that that quote from the Thursday Next books. And failing . . .)
The that/which thing has never bothered me. Which probably just means I never had a teacher who corrected me on it.