I'm probably being optimistic, but I don't think it'll take as long as the EDDs say it will for most of us to receive our cars once the firmware issue is resolved.
About 15-20% of the entire spreadsheet has a VIN already, with cars that have been produced. The first two days for orders accounts for 55-60% of all orders on the spreadsheet. ~40% of orders come after the first two days, with orders after April 30th accounting for only 15% of all orders. In other words, the vast majority of all orders Tesla has received for the M3P happened the first day or two, and it's been slowing down ever since.
So 30% of all Day-1/2 orderers have VINs. Well, seems like it takes 3-4 weeks for an order to translate into a VIN, and then 7-10 days for a VIN to translate into a delivery date (assuming the folks who got the first VINs had kept their original EDDs prior to this EPA/firmware issue being recognized).
About 8% of all orderers on the sheet have gotten VINs since only Wed. So they don't seem to be slowing down the pace of production, just the pace of delivery (and possibly transport, if they're worried that individual centers might become too overwhelmed with undeliverable cars sitting on their lots). Of course, one thing we don't know is if they're slowing down on reporting VINs to customers for cars they already built earlier. For all we know, they could already have built 50%, 60%, 75% of all Day-1 cars by now, even though they've only reported ~20% of those VINs to customers.
Anyway, all of this is a longwinded way of suggesting that it may take only another ~2-4 weeks from here to produce all Day 1/2 cars, and then another 2-4 weeks from there to produce all additional cars ordered after Day 2, with VIN-to-EDD being 7-10 days after that, for no more than ~10 weeks from today for even someone who ordered this week.
And it could be even faster than this if it turns out there's a whole ton of VINs that haven't been released. If suddenly we see, say, 60-80% of Day 1 orderers get VINs over the next few days, it could mean that production on ~60% of all ordered M3Ps is already completed or near complete, making production of the rest of the orders take place in just the next 3-5 weeks, for deliveries within the next 4-6 weeks. We could all have our cars by mid July.