Ask for a loaner that is equivalent to your X5, might be too late, as it sounds like you're about to get it back though. Get the full detail done and delivery. Terrible dealer experience, I agree, they should have given you an equivalent loaner from the start, or at least swapped you at day 3 or so with an equivalent.

That being said, a couple of weeks with a new loaner is not too bad; if you want an additional comp, try looking for something a bit less expensive and with less demand than a new Bridgestone, maybe all weather floor mats or shop credit for a future purchase or something?