I am not redefining the term here. There is no bait-and-switch. I am entirely consistent both with the Wikipedia article and with Dr. Haidt. Yes, the term is often used in a negative sense (and, to be clear, I think political correctness is bad) but it's original connotation was positive. My definition was consistent with both.

The only bait-and-switch here would be if I sometimes pejoratively referred to policies as "politically incorrect" which did not in fact meet the definition I provided, or if I applied it in an inconsistent manner. Neither I nor Dr. Haidt do this.

EDIT: so there is the pejorative and non-pejorative sense that is worth addressing. As the wikipedia article says, it is used in a pejorative sense when used to refer to situations where the suppression of potentially offensive speech is deemed excessive or unwarranted.

I (and Dr. Haidt) do use it in that sense, with the clarification that by "excessive or unwarranted" we specifically mean "without regard to the truth or falsehood of the speech expressed". That is the best way to summarize how the term is actually used in modern parlance with a great deal of consistency, particularly by groups such as Heterodox Academy.

Anyone who has a negative visceral reaction to the use of the phrase "political correctness" needs to be sure that they can understand and address that meaning of the word. It's not just a general "boo" word, but one with specific content and describes a real phenomenon.