[Vwdiesel] Source of rebuilt 1.6NA?

[jon.sykes at ps.ge.com]

It's been over a week and my mechanic is still having trouble getting parts
for the GTi conversion.  All this is annoying and now I'm wondering if I
wouldn't have been better off just putting in a rebuilt 1.6NA or getting my
engine rebuilt (whichever is cheaper).
I'm being quoted $2500 for the GTi conversion.  Although it would obviously
be nice to have the extra power of the GTi motor, it would also be nice (and
probobly cheaper) to stick with the original set up and keep it a 1.6
diesel.  I can live with the sluggishness as long as it gets me 30mpg and
200k (on good oil and good maintainance).

I did see a site that had complete rebuilt 1.6NA engines for less than
$1200, but now I can't find it (typical).  Can anyone therefore recommend a
place to get a good, but inexpensive rebuilt 1.6NA?

I was considering the 1.9NA, but it really seems a hassle.  The 1.6NA will
be a straight swop and I know I can get parts for it no problem.