While I agree it's infuriating the use of -punk for non-rebellious things, there were several other -punks before 2000s. The main one that comes to mind is Gothic-punk, which has been used in Vampire the masquerade since 91 to express the game's gothic and rebellious influences.