You could also try adding lemon juice/citric acid to your shave water to soften it as an alternative to bottled water.

Bob