Heh; I am collecting parts for the same project.

I stopped at Interstate Used Parts in Elsinore CA in May.  I did see
an extra pair of lower radiator mounts in their yard, which I assume
would still be available.  I got an 84-85 shroud, but I'm not sure
offhand if they have another.  I did see at least one van with the
harness for the fan switch, but I had ended up ordering a new one from
China:

3 Hole 893 906 231 Automotive Electrical Harness Connector 893906231
For VW Cable Socket

https://www.aliexpress.com/item/4001062127817.html
I haven't installed it yet, but it did fit the switch and the quality
seemed OK.

Alex