Stator,
After my experience, I'd say you did exactly the right thing to divert early. Also, well worthy of note, is that following the sand storm we had in RUH, the airport was closed for some hours while they cleaned up, swept sand and debris from the runway and movement areas, it took them a good few hours as I recall. So, unlike wind and rain which leaves the airport, usually, operational, after this sandstorm it wasn't.