New pump and motor equals new machine, well not quite, but in terms of performance it should give you plenty of hours of earnings and allow you to figure out how to clean most effectively.
If the job is, as you suggest, you might consider a rotary, for ongoing cleans, it will take about a third of the time and with the right products will give excellent results.