These are just some of my favorite bands you didn't list:
Black Sabbath '69-'78. (Hard Rock/Early Metal)
Lacuna Coil (Gothic Metal)
The Doors (Blues/Rock)
Zeromancer (Goth/Metal/Industrial; hard to find, but worth it)
De/Vision (Electronica, Rock)
Depeche Mode (Need I say more?)
Ayria (Industrial/Synth Pop)
Bat For Lashes (Electronica/Folk)
Collide (Electronica/Synth Pop)
Stabbing Westward (Industrail/Metal)
IAMX (Electronica/Rock)
L'Ame Immortelle (Goth)
Miss FD (Electronica/Goth)
That's all I can think of at the moment given my massive music collection. Hope it helps