Yes - be patient. I'm battling software issues myself, and I've been without my car for over a week while they sort it out. I would have happily waited another week or two to avoid the frustrations.
2013 X1 xDrive28i M Sport
2012 Q5 2.0T