Sorry I cant help with any of the parts your looking for , although Im sure you can still get all the parts, have you tried " expressed panels " pricey but they usually have the bits your looking for .

Mind and post up some pics , got to love a mk2 , thats prob the next one on my list