That makes a lot more sense. It does look like Jobber has expanded the invoicing side since you established that workflow — one-off jobs can now have multiple invoices, and they added progress invoicing/payment schedules. I'm not sure that completely solves your process though, because you still need that paid-service-fee → repair-quote → approved-repair sequence.
Definitely seems worth looking at whether the newer functionality could eliminate any of the duplicate work without changing the payment control that's working for you.
The links below to the improvements jobber have made might be helpful to you then.
