Once you modify the invoice template the first time, will they then pick up the next sequence of your custom invoice number from then on, so that you can revert...
Doesn't this still create an issue, being that you have to allow invoices to be invoiced first, presumably having already been delivered to the customer, before...