Nice team, with some unusual pokes for sand.
Looking at your team, there are ways to stop most common OU threats, which is the basis of a good team. I don't think directly switching pokes would keep the synergy and roles, but I do have a few tweaks.
Machamp is standard and I have nothing to...