Yes,
I have done all of that. I have a minor leak in the expansion tank which all of last winter. Would that be enough to screw things up?