Well I had this issue fixed at the dealership last week. There was a silicon piece in the heater core making all that noise. It cost about $200 since they had to drain/refill the coolant and flush the heater core multiple times to get the piece out. But it fixed the noise 100%.