The later radiator definitely works, as it was in the car when I got it. I think I am all set.
I am using the crank and water pump pulleys from the 85, motor mainly for the factory pulley sizes and belt alignment. I am going to swap the 85 ps pump brackets to the other pump I have.
I think I found the correct picture here also