it might be worth noting the VIN on the troubled vehicle (should've gotten it during build) so you're sure not to get it later. Can they swap VIN plates?
BTW, I saw the new X3s out on the road with the corona lights... looks nice... I can't see any reason they wouldn't put it in the next E70s (it's in the same fricken production shop)... but that's just me.