M10 Power Steering pump

[mru77]

I have a '85 M10 4 door
My PS pump is whining and I'm about to do the E36 Steering rack upgrade.
Question for experts out there:
Since I need a new/rebuilt PS pump:

-Is 325i PS pump compatible with my M10 set up?-325i pump more availability is key factor-
-or any e30 PS pump is compatible with each other? 318is, M10 and 325 have different part numbers
(according to Real OEM , different P/N's for M10, up to '87 and so on)

Anybody who did the swap to M10 , do you have any issue with existing pump? I mean compatibility

last option is to get my pump rebuilt

[Sunnyledge]

I have a E36 rack in my 84 318i and the original PS pump seems adequate. I installed a used rack and used the original hoses. The only issue I have is what I’ll describe as a little “hitch” that I feel in the wheel when turning both left a right that I think is from the modified steering knuckle.