there's been mention of a Hayden short fan assy (I forget the #). the legs on a BB pump can be milled. the "cross" on the WP can be pressed rearward a bit to move the pulley rearward along with buttonhead pump mounting bolts. The hardest part will be locating the correct depth pulleys to restore belt alignment. maybe even a rad with less cores (or just thinner) & a wider one to restore cooling capacity & "area" is more important than cores & it is for sure easier to expand clearances out sideways against the frame rails for more area.