thats the approach m talking about. why waste all the money and effort that your have put in previously.
also one more thing, if you can trust a mechanic let him work alone on the car. usually they dont find solutions when supervised upon and you are asking and stopping them from doing certain thing their own way.
i know its not right but thats the way it is. they think that their work is their art item, incase you know that all he did was changing a fuse or applying kachi tape on expansion valve it would give away their secret so they dont put in the effort to fix the issue since they wont be able to ask you for their labor (watever they think is worth). so let them work on the car themselves.
i had been trying to get the airbag light go away working with the mechanic quite a few times since the light only appeared after rain and some water seeped into the car. no solution. i got the feedback probably the sensor has gone bad etc.
i asked my ustad mechanic that i want it fixed. he said leave the car with relevant guy. i left the car for 2 hrs. all he did was cleaning the jack of the wiring and fitting it back. eureka light went away, error went away and airbag system is back up and running. i realized he didnt wanna do it infront of me. since later he asked 1500 rs for the trivial job. i gave 1k to my head mechanic and told him to settle it with the relevant guy. 
Just shared my experience working with labor for you. hope it helps.