Again, an excellent post, SW. Thanks for sharing your knowledge. Only some names of the disorders does not match with the idea I have about them, but I prefer to reread its descriptions before commenting this.
I would like to comment two cases IRL: my mother, who I previously typed as ISTJ, and my brother, ESTJ.
Both of them are control freaks, my mother about objects (cleaner maniac) and my brother about people (if you don't do what I say, then you're bad, you're lazy, etc, etc, etc). The last also has no respect for other's feelings, he give a shit because "he has right" (in his mind, obviously). I do not remeber any of them recognizing mistakes...
Should I consider ESFP/ENTJ for my mother and maybe also my brother? Although what you said about ESTJ also matches, the difference between this two cases are a bit diffuse.