Thanks for all of your advice. I decided to go with bigger heatsinks and lose the fan completely.

Moving the fan etc didn't seem to have any effect. I will test the full circuit out with the volume right up and check that the heat is ok. I can always add the fan later if I really need it