I'm over 15k miles now so it'll be in for service the next 2/3 weeks.
The guys at my shop are pretty good so they should figure it out (hopefully).
I'll post what they find and if my baby runs better when I get her back.
In any event, I think it's time for new pipes and PCIII
(and sprockets, and suspension, and throttle cables, and steering damper, and new job to pay for all this...).