I think both are okay~ The one-day tour to the Great Wall may save your time and ease the travel. Or, you could take the city-bus 919快 at Deshengmen bus station to Badaling directly. This will be cheap but you have to pay attention to the bus's operating hour. Just for your reference~

Thanks...