Excellent move both on the Mk1 Golf and on the daily driver Leon idea.
You on Mk1GOC?
I also have a Mk1 and now have an 'X' Leon
Cupra for the long haul commute.
As long as you know any Leon will never have as much grin factor as the Mk1 then you're on to a winner. Good Luck
Matt