I agree with your classifications. However, I think nowadays 'hardcore', as a genre, has transformed into something else. The handful of bands I have tagged as 'hardcore' in WMP are Stretch Arm Strong, Walls of Jericho, Dead Hearts, and Converge. I don't think these bands have enough 'metal' in their songs, if you will, to be justified as metalcore, so I tag them 'hardcore'. They're also certainly not tough guy, tech, grind, prog, or post-hardcore, so... who knows.
Also, 'hardcore' in its original form is pretty rare nowadays.
(I know you'll probably scoff at my labeling of Converge as 'hardcore', but they seem too noisy and dissonant to be 'metalcore', to me anyway.)
Criticism appreciated.