Your thoughts are the same as mine then on the diagnosis. hopefully someone will chime in who has had the same issue and can post their cure.
I just took the car out for its last drive for the season today. so over the winter I have a few projects I want to tackle. I think I will replace them both for good measure.