You're missing the point. "Censorship" is an abridgement of freedom of speech. Whether it's legal censorship or illegal or even government mandated, it's still censorship. You're trying to change the meaning of well-defined terms because you're uncomfortable with what the implications of them might be. If you're pro-censorship, just say so, don't try to change what freedom of speech means.

There's no one who would advocate complete and total freedom of speech in every arena. Whether it's social, legal or self censorship, the question isn't about whether a line exists, it's where we place it.