I was advised to continue buffering the plain water during the flush, yes. although I think you don't need to be as "precise" about it since you aren't locking anything out (maybe minerals).
I think, to a certain extent, it depends on how hard your water is....