After having the car for a number of days, and putting nearly 150 miles on the clock driving around trying to trace the fault, the dealers tracked the fault down to the heater matrix pipes deep in the bowls of the dashboard.
They secured them and put some padding around them, and, fingers crossed, the car is quiet again.
