Taxes on Service Jobs - with Labor not supposed to be taxable

We are starting to integrate companies into our Epicor system that have to pay taxes on their service jobs. The situation we are running into is that Labor is not supposed to be taxable, but by the time a Service call hits the Invoice entry, both labor and material are combined together, so it taxes the lump sum. The labor is being accumulated onto a job for the line, as well as all of the Material transactions. The taxes are being controlled by the Product Group on the line, but that doesn’t allow us to separate it out. The only way we have found to correct it is to override the calculation, and change the taxable amount to just the material total.

One thought was to have 2 lines on a call, accumulate labor onto the line 1 job, and material onto the line 2 job, but this is a pretty messy solution. Dopes anyone have any guidance or thoughts on a better way to handle this?

We are looking at going the Avalara route, but they have said 2 months for implementation, and we really need to get taxes right on the current invoices we are doing.