Talked to the Service Advisor, who says he definitely noted everything we discussed on the repair order.
They want be to bring it in again. Which is fine, if they actually fix it all this time, but I'm really getting tired of driving the ******* car down there and back.