I just use the water as it comes from the tap, with the recommended amount of Ilfotol wetting agent in the final rinse for B&W - colour has it's own Stabiliser which should be the final thing that touches the wet film. Never have any problems with drying marks, though i'm lucky enough to be in a soft water area.
I think in your situation ped, I'd probably just use whatever came out of the tap for all but the final rinse :shrug: