XFgal,
This is just ridiculous. I'm gonna check with my mechanic of 22 yrs, to see who he would recommend in the area to work on your car. It may be here in Maryland, but at the prices you're paying now, it would be worth the gas and time to have it done correctly and at a reasonable price.

NOTE: anyone of our NVA group have any recommendations on good shops to work with on XF's, it would be helpful to know.