I notice in your message that you wondered if the origin of the names Garay and Olague were Arab?
Those names appear in a book I have called "apellidos vascos" (Basque Surnames). My father's name was Guadalupe Olague (from Jerez, Zacatecas. He had told me that his surname was Basque. There is also a town in Navarra in Spain with that name. There are many people in Zacatecas with Basque surnames, since it was settled by Juan de Onate's father, who was a Basque.