Any chance of resolving this invoice template issue?

At the moment, to be able to use my custom template for my progressive invoices, I have to unlink my invoice to the estimate and manually enter the figures. I save as PDF and send to customer. Afterwhich, I delete the unlinked invoice and create new invoice linked to the estimate. This way, my QB Online transactions "seem" linked to each other. But this is very inefficient.

Hope to hear from QB Team soon.