I've personally noticed D2 PS systems don't seem to hold up to the older D1 PS system pump wise. Pumps themselves are nearly identical minus the 1 rubber line has a different angled nipple to the reservoir return line. The main difference is the D2 uses PS Fluid and the D1 system uses Dex ATF. I think the older RRC/D1/Defender setup is more robust. The boxes are prone to leak, but the Lucas PS Additive usually fixes it with very good results unless the box seals are completely trashed.

 

https://www.ebay.ca/itm/265041156540
I'm pretty sure this is the kit I used. IIRC, I did mine because it was leaking, but I don't remember for sure.
If you do it, the only risky part is that there are a couple of tiny parts that I wasn't aware of and was lucky I didn't lose them when I dunked it in the Varsol tank to clean it.

 

I'm also planning on an electric swap. The controllers are cheap, and I found a used Volvo pump on FB Marketplace for less than $100.

 

Appreciate the response, I'll keep in tune with your thread in case you find a good new unit, I will keep my noisy one until it dies

 

Update - got a notification from Rock Auto that an AAE is in stock, so jumped on that and will report back when it's installed what the outcome is. Maybe lucky #7 will be the pump that actually sticks around.