Before ordering parts or making your decision you need to inspect both valve plates and the motor rotating group surfaces. You will have to replace the valve plate for the pump anyway. Inspect the charge pump as well.
I would be less concerned about the thrust bearing for the motor and the...