Griffin Rad fitment issues

I can't tell if the engine is too far forward or not, but here is the 440 in my son's Dart. Radiator is a Griffin universal installed with modified Ford mounts.

He's got the combo unit which has an electric fan on it. It sticks into the engine bay too far and apparently would contact the water pump. No fan blade like yours.

Not sure if there is a shorter water pump for a big block. My first thought was to go to an electric one but they are usually race only and don't last long under continuous duty. People use 'em on the street but it's not the norm. They're also really expensive.