If the mechanic is good, I'd stay with him. It's the machinist fault. We are now living in a third world country. Things take forever, patience is required.
Just for reference, my brother bought a electric Porsche, it has been in the dealer shop since February. It's a $180,000 car and he is a...