Yeah... I'd say the same thing but you can never be too sure

I would get a mechanical gauge put on it (aswell as your pressure switch) and that should give you some good indication of what the pump is doing

I would personnaly change the oil and put a genuine filter, just to be on the safe side...