Not yet, to both of those questions.
Just now the options seem to be (a) further attempts to get the garage to speed things up (b) let them get on with it, taking however long it takes. Or (c) the nuclear option would be to recover the car and arrange the repair myself, obviously in the hope that I can reclaim the cost from someone or other. Will need to press on starting with (a) on Monday.