I have a similar problem. I tried installing a water hammer arrestor, but it didn't work that well. Hunter makes some slow close valves, model HPV, that are supposed to suppress water hammer, but I haven't tried one yet. If you try it, please post back here and let me know if it works.
-Steve