I think it's silly to type Sauron, who has no personality in the movies to type. But you're right that ENTJ is overdone as a villain type (along with INTJ). I thought Foul was a typical ENTJ villain, but come to think of it, he has no NT in him at all, which is to say, he doesn't express any interest in Ni concepts. And his speech patterns match those of the ESTJ type. I had to research Rakoth Maugrim because I have no idea who that is.
Bannor and all his people have exactly the same personality: ISTJ.
Sauron actually is fleshed out a bit in the Silmarrilion and other writings. He was an early convert to Morgoth but could put on a facade to trick everyone.
Sauron was a great and powerful Maia, serving Aule the Smith, who created the Dwarfs.
Sauron loved order. After Morgoth was captured after the beginning of the elves, Sauron continued his programs, including breeding orcs.
After Morgoth returned, he was his chief lieutenant and known for his illusions, shapeshifting, and cruelty.
After Morgoth's defeat, he put on the pleasant form and again convinced the good guys he was sorry, but he didn't go get his pardon, out of shame.
Tolkien wrote that Sauron was not fully evil. He just wanted his goals of being worshipped by men and ruling them. And he loved progress and development.
He then put on a pleasant hue, seduce the Noldor smiths with his knowledge and power, thereby creating the rings of power. It is interesting to note he wanted dominion over others more than anything else.
When the Numenoreans came to attack him in Mordor, he put on his beautiful hue and surrendered, eventually bringing about their downfall.
Only after his body was destroyed in the destruction of Numenor did he lose the ability to put on a pleasing aspect.
Overall, I think we have enough to type Sauron. Sauron does not appear to be a ENTJ.
I do se him as a Je user. His chameleon nature and tremendous persuasion skills and desire to be worshipped and to dominate others seems to put him into Fe user territory.
He seems to be Si (he repeats known plans in building forts and trying to conquer).
His bringing down of Numenor seems like a FJ plan, not a TJ plan.
I actually believe he is a very unhealthy ESFJ. His unfortunate tunnel vision and desire for domination tied his eternal existence into a simple ring and that was a very poor idea.