Souds great
I would suggest soaking the pumps in some vinegar just to get rid of any calcium buildup and prevent any possible seizing probs in the future.
And yes, replace the vho tubes
I recomend once a year for URI tubes, some folks replace every 6-8 months. I wouldn't worry about cleaning out the plumbing, it's stable, let it be.
Mike