I just tried the suggested fix but it did not work. Instead of showing the invoice as a credit against the estimate, it combined the two and was attempting to increase the amount of the invoice.

Please confirm that your process would show the invoice as a credit against the estimate and in turn the estimate should show the correct balance remaining to be billed/invoiced.