Joe - I will second Sellwood Cycle Repair as my "go to" shop. Super helpful, great mechanics, and I've never felt like they tried to do more that what I brought my bike in there for. Not to say that River City or Bike Gallery do that, but I have been a fan of Sellwood since the days when I worked downtown and didn't know how to do so much as change a flat - I would walk my bike in there and they would always get me hooked up as quickly and inexpensively as possible.
Your bike has spent a lot of time there already in its history, so would be right at home. They probably won't recognize it due to the color change, but they have seen it on a lot of occasions over the past dozen years.