While it is in the shop have them check the derailleur hanger alignment and correct as required. They are not always aligned properly from the factory. Also make sure that you are making your adjustments gradually so that you do not overshoot the proper position, 1/4 turn of the screws or barrel adjuster may be too much when you are getting close.