Welcome mate,
you're not the only one wanting to swap for a bit of Mk1 action. Only I need to get something to insure my learner girlfriend on, so I think a Mk1 GTI is out of the running.
So, my Mk2 16v will be for sale soon, boo hoo :'(
But it will mean I can get a reasonable Mk1, then later I can swap the engine for something a bit bigger.