One might note that his second raid on Columbus ended in disaster for him as the US Army was present and set up machineguns in the streets with pre-planned lines of fire and slaughtered Villa's men who were completely surprised and confused by the Army's well-arranged killing zones.
But news of the Santa Ysabel massacre didn’t trigger any U.S. retaliation. So Villa tried something more audacious. In the predawn hours of March 9, 1916, Villa’s men raided the town of Columbus, New Mexico, three miles north of the border. A regiment of the U.S. Army’s 13th Cavalry was encamped at the town, and its munitions depot was a target of the raid. Despite being surprised by the attack, the U.S. troops quickly regrouped and returned fire—at one point setting up a Benet-Mercier machine gun in front of the town’s one hotel. The fighting, as well as the fires set by Villa’s men, left the town in ruins.
So not a second attack. There were no "well arranged kill zones". They were able to improvise a position, but that was neither "well arranged" or a "kill zone", much less multiple "kill zones." Villa's men were not slaughtered, in fact only 8 died. Just about everything you originally said was false.
Battle of Naco and Agua Prieta
Neither involved US forces. They predated the Raid on Columbus, so could not have been part of the punitive expedition that followed.
https://en.wikipedia.org/wiki/Battle_of_Naco
https://en.wikipedia.org/wiki/Second_Battle_of_Agua_Prieta
The US Army didn't standardize trucks and phase out horses until the mid 1930's.
Class-B Standardized Military Truck, better known as the as the Liberty Truck, had its design released in 1917, well before the mid-1930's. It was first released as a suggestion, but after all that went wrong in the Punitive Expedition, it was made a requirement.
https://en.wikipedia.org/wiki/Liberty_truck