Mobius, there are lots of different strands of goth (there probably are on punk too, but I am not familiar with them), some like the half-shaven headed woman you mention come close to punk, but others, for example the ones who like medieval dresses and poems from people like Byron and Keats are still goths, but very different to punks.

Most goth women have long black hair, and like corsets and long skirts, but whether those corsets and skirts are PVC, leather, silk or brocade makes a big difference. Whether they have tattoos and piercings is another factor.

There are a couple of other strands of gothism too, which might seem closer to punk. There is the 'corporate' strand, with overlaps to mafia style too (Pink has adopted this style sometimes), lots of pin-striped stuff, and this often has bondage straps and zips like punk. For some goth women there is also the 'lolita' style which is short dresses and clunky boots, which again could seem close to punk styles.

The music varies considerably too, the difference between 'Cradle of Filth' and 'Opeth' on one hand which sound like thrash metal over to 'Lacuna Coil' and 'Within Temptation' at the other extreme, almost operatic, at times like folk, shows the range.

So yes, some goth women could substitute for your punk, some could not, but maybe forcing them to make that change would be part of the appeal of the story.