If you run into trouble locating K&H rads helped me out in Scarb.
I got a rad for my 85 for $185 brand new. It had the auto ports on the side so I could use it in a manual or auto car. Not a bad deal for a new rad which you know won't be trouble for a while. Not sure about the pricing on the later ones.
09 Jetta CleanDiesel M6 Highline
85 325e M5
07 Honda Shadow Spirit 750