I had a similar experience. Regulator was failing. Pressure was on the lower side of the normal range. New regulator solved the water hammer.