So I got an update on this. The repair is saying the pump is no good. They did the pressure test on the line directly from the pump and were only getting readings of max 2400psi at full rpm and then would lose pressure. They then did a flow test on the pump and it failed. $210 for the diagnostic testing. He had 3.16 hours logged but knocked it down to 2 hours which is probably the actually work time they put in on it.
So far so good. I ordered the parts for them since they do a % increase if they order. So my total for parts is $654 (should be there next week sometime). He estimates 3 - 5 hours to replace and 5 hours being if a lot goes wrong. If that stars align and everything is perfect, I may have my tractor by end of the day next Friday. Reality, I'll probably be picking it up sometime the week of the 16th.
I did, however, ask about swapping my loader control valve for one with a 3 third function. He had something coming in today for an excavator that is new to him that he is trying out. Supposedly its a 3rd function control and only cost $295 (part only). He was going to let me know how it worked out for him and if it was something we could do for the tractor. I would like the 3rd function to be at the joystick instead of behind me and to the right.