Making a fan shroud

My concern is clearance to the water pump snout, based on what I see on my set up. But you're designing so that's probably taken into account.

Your concern was well founded. I didn't have nearly the clearance I was expecting. I need to find a lower profile fan and may have to make some tweaks. Bummer!