I just went to Si-Ma-Tai for the Great Wall rather than Badaling. It was a bit of a drive though (I was on a bus). I did everything else. I actually enjoyed the train ride to Xi'an.
I also climbed Huashan when in Xi'an. Well, I rode the gondola up, then climbed from there to a hostel and stayed overnight. That was a blast.