Ugh, annoyed to hear that!
Call me sensitive, but a $2500+ device should in my opinion never have issues like this. Personally, I will go down to the shop today for a third time and request a swap.
I am having the same problem but when I brought it in i was told they would have to send it in to be repaired which can take at minimum 7 business days and because i customized my unit it they can't just swap it for one in store.