radator and fuel pump................?

hey!
i was wondering if any one would be able to help me out with a few things…?
im in the middle of putting a mk2 1.8 16v k -jetronic engine into my mk1 golf c..
when i bought the car it already had a scirooco 1.8 8v carb engine conversion.
im in need of a new radiator as my old one is broken, what would be the best one to replace it? i wasen't sure if the mk2 golf radiator would fit?
also should i keep the same fuel pump or upgrade it…..?
                                             
                                                  thanks sean

Mk2 rad fits, but believe 16v is 'best' option being longer. Fuel pump will be fine.

cheers mate!