I am about to go through this as well with a weird hybrid experiment. I was thinking about pumping out old water like you said, then trying to spray some fresh water around the reservoir the best i can to rinse it out, then pump out again before filling.