Jack:
Barry Wolk posted some great work on restoring the windshield washer system. He took a rebuild kit from a Cadillac and rebuilt it.
Check this out: https://forums.vwvortex.com/showthre...shening/page15