Help - front suspension problem messed up by indie

[zachthefcr]

I have a 2005 X5 4.4, and about a week ago, while driving over small imperfections on the road, I heard a rattle/knocking sound from the left front wheel area. Occasionally, also, when turning the wheel, there was a low intensity knocking sound when initiating the turn. I took the car to an indie repair shop in Bethesda, MD (where I live), having moved from another indie shop where I had some problems with the quality of the repairs. The new indie shop was very highly rated in the Washington Checkbook (a Consumer's Report of sorts) as well as on Yelp. I communicated with two of the Yelp reviewers before taking the car in, and who highly praised the shop for their BMW's. After the shop checked out the noise, I was told that the problem was the ball joint (I was surprised about this as the car only has 55,000 miles on it). The ball joint and the control arm were replaced at a cost of $550 (BMW (parts were used). I picked up the car after hours, and immediately noticed that the noise was still there. They didn't even driven the car to test out the repair. In addition, a warning light was on that my suspension leveler was inactive. Was I livid! A mis-diagnosis that cost me $550 plus they messed up the air suspension. I went back the next morning, asked for a refund, and was told they would do this, but would place back the original parts, which they held on to. Does anyone have any idea what the noise, may be, and what many have occurred with respect to the air suspension being messed up with a ball joint repair? Do I trust them to put back the ball joint and control arm that was in place before having them do the repair? Can anyone in the Bethesda, MD-Washington, DC area suggest a reliable and knowledgable indie shop? Thanks for any help you can provide.