E30 Steering wheel with air bag and power steering pump

[Purvis Brad DR-III UAVB/DOI <brad.purvis@xxxxxxxxxxxx>]

Need some help. I plan to replace my airbag equipped 91 325IC with the same
model air bag equipped wheel. I have pulled the wheel a few times when I
installed the new steering rack and made the mistake of not centering the
rack before replacing the wheel and centering the wheel. Thus the wheel
turned farther one direction then the other resulting in the slip ring
inside the wheel breaking and disabling the airbag and now the horn.
Question is what year e30 or e36 (is it a possibility) airbag steering
wheels will work. Clearly I will recenter before replacing the wheel this
time.

Second question.
Of course once I had the new rack in place then the power steering pump
groans when cold for a few minutes indicating to me that a replacement pump
is in order. Will any pump from the e30 series 325 line work for this
application? I know that the pump was fine before the replacement of the
rack but guess that the life of the pump was up too as there was
considerable particulate matter in the power steering fluid suggesting to me
that the pump had the wear accelerated too. I completely drained and flushed
the entire system before operating the rack so I think the rack was close to
its life and now I need to replace the pump.
Any suggestions as to suppliers? I am looking on ebay and Weber too but
anyone that knows a good supplier for a pump I would appreciate the steer
(pun intended).
Thanks
Brad Purvis

------------------------------