I would definitely use this as an opportunity to upgrade my derailleur, but I might also advocate some patience and letting your LBS do the work, as I think building/maintaining that relationship is a good thing. I never have to worry that my preferred LBS is going to shortcut a repair for me, or that they won't bump me forward in the queue when it is important, because I am an active, loyal customer who they know is supportive.