My last bike had the same issues. After many return trips to the LBS they became tired of the issue and started trying to charge me to fix the spoke. In the end I was tempted by a new bike from a different LBS. This bike was better quality as were the wheels and I have found myself thinking just how much more confident I am with these wheels. Also this shop has been 100% with taking care of me as it should be. Everything that was suggested to me indicated that the wheel would/should have been rebuilt to make it right. Hopefully your shop will hook you up so you can get that same feeling.