You have clearly put far more thought into the respective aesthetics of goth and punk than I have. Thank you for this.

Another author question, then: Simon Logan? (fetishpunk, cold and alone) By your definition and by what I know of his influences, his industrial fiction—especially his later work, which is unfortunately all forthcoming so I can't refer you to it until the summer—falls far more clearly into the punk category. His only extant collection is i-o, from which I especially recommend "Ignition" and "Akin to Insects." I'd be curious to see what you think of him.