I got my baby back yesterday, so when I got home last night I had a play.
I replaced the lock pins, put my new VW tax disc holder (got rid of the manky dealer one), put the OEM golf ball gear knob on (replacing the after market alloy gti one). I then took out the dash speakers and replaced the old blaupunkt speakers with a new set of alpine 3.5"s. The difference in sound quality is incredible.
After that I, it was a wash and shine, did the windows in and out and then AC/DCed the trim, wheels, spoiler, window trim and wing mirrors.
Stood back and had that great VDub smile on my face...

One small point, on the inside of the front passengers door a small piece of trim has come off. If you look on the grid it is on the edge of Q4. It is basically the triangular piece of plastic that sits on the door where the wing mirror sits. It appears to pop into two grommets mounted in the door, only I can only see half of the blue of one grommet and no grommet in the other hole.
Am I right in thinking this is what I need, and of so anyone know the part number?