I am fairly sure what your second noise is. Go to the top of the shock absorber, and you will see a small steel retainer bar across the large rubber shock mount. When mine worked itself loose, it made a constant rattling sound just like the one you describe. Tighten it down with an allen key a suitable wrench, using the allen key to hold the shock steady.

David Hendy
16V 190 '87 104K miles