Thanks for doing a survey and making some updates out by Ocotillo! Just FYI, there might be some differences of opinion about whether the gated roads going to the wind turbines are highway=service or highway=track. Personally, I'm fine with either one and I mostly leave the highway=* tags on these roads as I find them. But you may find that other mappers will switch the tags.