When we lived in Las Cruces, we also enjoyed a restaruant in Old Mesilla. The church courtyard is interesting as is the jail where Billy the Kid was housed.
Hope it is still as nice as when we were there, which was 46 years ago.
The restaurant was great, but just can't remember the name. It was my introduction to Mexican cuisine.