In soapcalc, change the way it calculates water from % of oil to lye concentration, it will be much easier to track your water discount. What that does is let you chose the concentration of the lye in the water rather than the amount of water vs oil. Much easier to keep it constant between recipes and it makes more sense to most people.
30 to 33% lye concentration works well for most people -- the default water as 38% of oil weight is around 28% lye concentration if I remember correctly.