Yup agree e21 parts are scarce, me too are struggling to get parts, currently I am in the midst of rebuilding it back mechanically as the last I did was more than 6 years ago, again parts availability is a challenge now.
Just did a total replacement of the brakes, power steering rack all completed, now stripping the long shaft!