Pretty sure the stat valves have been put on the wrong pipe (can't remember if they need to be on flow or return). Is it a big job to swap them over & does ££££ come into it ? Water hammer drives my nuts - always the valve under the computer desk in the second bedroom that goes !