from what you have wrote id be parking it in the showroom id leave it with them till they have sorted it. sounds like they have had the new aprentice working on your car