On putting the later 235 you might think about using a water pump adapter that let you use the old style water pump. With the adapter the fan runs at the correct height with the shortened pump the fan runs real low on the rad. I've used the short pumps in the past and have had heat problems when the truck was worked hard. You can get the adapters from several of after market dealers.