Totally agree, a rebuilt NA will last, if you get a second hand TDI you will still have to rebuild it one way or another.
Like Flat I love my N/A motor, cheap parts and simple to work on.
Will be doing a full rebuild on mine, probably next year as slight oil seep from front and rear crank seals.