However, if Hispanic is stupidly included as White

Hispanics value light skin culturally and they often identify as white. In Houston the white percentage shrinks from ~70% to ~30% if you exclude Hispanics who identify as white.

I understand the issue with that, but it's a lot more desirable than the alternative, it's a sign of assimilation. If they strongly clung to their identity we'd be recreating a Mexican shithole here.