welcome.

I don't think the CCV delete is an upgrade. a fresh CCV is good and hassle free for 80k mile or so.

test your fan clutch with a small roll of newspaper...If you can stop fan with engine hot and running...replace it with a Behr/Sachs brand fan clutch.