So speaking about water hammer...I've installed about a dozen of the Sioux MiniRester valves near the problem areas. They really work well and I'd recommend them for a simple solution. I installed them with Shark Bite fittings...easy peasy.
https://www.siouxchief.com/products/supply/arresters-and-trap-primers/arresters/miniresterYears ago when they plumbed a house, they'd install a 2 1/2" vertical pipe in the system that was about 4'-5' tall and this became the arrestor that prevented water hammer because it provided an air cushion. Unfortunately, after a couple of years the vertical air chamber slowly filled with water and it then no longer served as an arrestor. It needed to be drained every couple of years to perform its service. Well this became a PITA for most people and here we are today.
In the last several years, I installed several outside hose timer valves on the hose faucets and they also have extremely quick acting shut off valves. Unfortunately, they have produced severe water hammer whenever they were turned off by the timer. The good news is that the installation of the Sioux MiniRestor has resolved these issues.