I would insist on the problem being fixed to your satisfaction or ask for a refund. Don't bounce between shops - pick your shop - in this case stick with the shop where you bought the bike. Makes it difficult to diagnose problems or honor a refund if someone else has been tinkering with it. It is rare that my bike gets adjusted right the first time - always seems to involve multiple trips.