I think both origins are probably correct at the same time, as you well know, Texas is a big place, and communications/movements of people were very slow until the 20th Century.

Black cowboy culture is kinda lost from the popular narrative - and cowboy culture was anglicized to an extent that the Mexican origins were also buried - similarly both mexican and black folks experienced similar kinds of racism depending on which part of the state they were in.