Been the complete route! Conclusion for me was... spending 300-500 for refurbishing a radiator is nothing more than a crap shoot. I took the plunge and bought a Berg.
If you want a pressurized one for your A they will build it.
I stayed with their 3 row 10 fins per inch and no more problems. Now installing a thermostat to warm things up a bit
The lesson: I now watch the road instead of the darn temp gauge!