Probably better to remove the term Hispanic entirely from the Census, and other government statistics. The phrase applies more to culture then any ethnicity.
When I was in grade school the textbooks taught about “mulattos” and “mestizos”. I forget which is which, but the point was that “Hispanic” wasn’t a race unto itself or even monolithic — it was a function of an individual’s white, black, or Native American ancestry (Native American itself being most closely related to east Asian, though due to time and distance also on its own evolutionary path).
The term Hispanic is a made up classification brought to by Richard Nixon for political reasons. I am sure the different nationalities covered under that huge umbrella wouldn’t like to be grouped together with the others.