Going by immediate place of origin is much more in keeping with the definition of "Hispanic or Latino". You're acting in good faith, obviously, but claiming every Hispanic/Latino person based on ancestry is too OR, too subjective, as can be seen from all that explaining you've had to do. There is a way to include these people we're discussing: with the support of reliable sources that refer to them as Hispanic or Latino, something that ideally should be done for everyone on the list.