I would say first try to reapply the thermal paste and clean the heat sink. Also if the fan is making noise it might be because the ball bearing is damaged and therefore the fan might be going slower than normal(Of course it could just be a loud fan). If this does not help, than getting a better heat sink and fan is an option but you could also try and slightly down clock the CPU.