Fan question
I'd get my radiator first, then take measurements ( after the motor is in) and try a clutch fan. If you can pick up an old day body shroud for a few bucks or you got one laying around it wouldn't hurt to mock it up and see if it works. I'd venture probably, But, if they change the accessory configurations or pulleys or something like that, then...