I'm running the MP thermal clutch fan kit with low drag 5 blade fan. (496 B). It cools great in my application. I understand what is sold now as the low drag fan was a production fan in the late 70's/80's if you want to check a JY. I have a big 7 blade fan from a Cordoba as backup but don't need it. Bouchillon also offers a 6 blade replacement fan.

The JY might be a good place to look for a shroud. Mancini is also offering re-pops and might have what you need.