I have done the above although I would point out that the BIOS was actually a downgrade from the one I had installed (A06) and also the boot-time diagnostics tested every fan apart from the ones that are causing issues.
I will run the machine normally and get back to you with the result.
