Technically, Goth is an attitude and a worldview rather than a music style which is why there are many flavors of Gothic music. In music there is Industrial Goth, Ethereal Goth, Atmospheric Goth and Classical Goth. It is true that the last round of Gothic thought probably sprang from the Industrial/Punk side, but all the other styles were out there as well. Goth itself predates Industrial, drawing from the tradition of the Romantics in the 18th and 19th century, and architecturally from the Gothic Revival of the 19th century.
I like Collide which is Industrial/Darkwave, but I also listen to Nox Arcana which is more Atmospheric/Classical. Then there is Dead Can Dance which is more Ethereal/Traditional. They’re all Goth in attitude. I'm still a little ambivalent about Death Rock as it feels more Punk than Goth. I've never really enjoyed straight Punk.