So, spoke again today. No discussion of price, I guess that can happen when I bring it in. But basically, he said I need to bring in the car, and leave it with him for an hour, and he can fix it all.
I have my doubts that he can fix all of that in an hour... so I don't know what to do. I don't want him to cause more problems. *sigh*