Hi EL77,
There is a fix for the noise from the fan - it requires a reprogramming of the CAN BUS system for the fan motor.
Mine was done when the car was back at Malvern and it is now whisper quiet.
Cheers
Simon
ps - I cannot comment on the other noise; however, have PM'd you with an option.