Cheers for the replies.

It's my first go at a head gasket, so I'm learning!
So we think that particular water gallery will be ok then? I'll have another look at that peppering and see if it's removable. The other cylinders aren't like that, but it could be because it was that cylinder leaking.
What do people think of payen gaskets? It looks pretty good but I guess not as good as VW stuff. The headbolts aren't genuine either! But all the rest of the stuff I had to buy is (injector o-rings etc). Been quoted 2.33 each for the smaller rings (KJET injector, air shrouded type) from VW! Talk about premium prices!