I’d take the hit with social D. I also considered propigandi and quibbled with adding rage against the machine, but they split genres a bit, raw punk spirit or not.

If we are gonna push the genre, I’d add in Gogol bordellos gypsy punk and The Cramps psychobilly. Both get my ass in gear the same way as all the above.