This would be a great topic for one of my friend's to thrive in.
I think the Misfits would fit into this genre (I
think, I'm not sure). Sadly that's the only band I know in this particular genre, and I am not an avid fan. However I have listened to a few bands here and there,
all of them from a friend, but I have since forgotten their names.

The only other band in this category I actually know is AFI, but you already know them well, so I can't really suggest any other groups.