Goth(ic) music is Gothic Rock 
Nothing more. All the other genres are not compulsory connected to Goth. A Goth can listen to many other genres, pop, rock, jazz... but the main genre is Gothic Rock. Gothic Rock is the origin of the Goth subculture. Dark Wave is Dark Wave, Cabaret is Cabaret and Post-Punk is Post-Punk. It's no Goth music and it was never Goth music.