You've pretty much got the lot. One might add:
Ruler of a nation - Dr. Doom
Wizard/occultist - Morgan Le Fay
Monster - Fin Fang Foom, Godzilla OR
Unstoppable engine of destruction - Doomsday, Hulk, Seth
Robot with all the powers of a hero team - Amazo
Cult leader - Brother Blood
The international criminal conspiracy - Hydra, VIPER
I tend to distinguish between world conquerors with armies like Attuma, Annihilus or the Anti-Monitor and those without - Count Nefaria, Dr. Doom
With gods/demons I would distinguish between:
Evil gods - Loki
Satan-analogue - Mephisto
Cthulhoid gods/demons - Shuma-Gorath, Cthulhu, Nyarlathotep