Forgot to mention, I also got my new door handles. They are cheap aftermarket, but better than nothing, which is what I had on the driver's side. It looks good, but you still have to hold the handle in a bit when you pull on the latch to open. I guess no Mk2 door handles are any good.
Also, oddly enough my old key will open the new lock.