Apple's Big Announcement on July 15th?

I agree with most of the predictions regarding Apple's big announcement tomorrow - its about the iPhone 4.  The bigger question about the announcement, however, is what is Apple going to do to fix the problem?  Here's a few of their options (and NO, a software patch is not going to fix the physical design flaw):

1. Recall all of their iPhone 4 devices, replace the metal material used around the device with a non-conductive material.  This would be the best thing to do for the customers because it will prove that Apple cares enough to fix their product and ensure that their loyal user base is happy.  However, the cost of this option will likely cause Apple's investors to be unhappy.
2. Send out cases to all of the new iPhone 4 owners to cover the problem with a band-aid.  This option would definitely have a lower cost associated with it, however, not all iPhone 4 customers are going to want the case on their device. Furthermore, how do you compensate the users who've already gone out and bought a case on their own.  Investors on the other hand, would see this as a viable solution that doesn't break the bank.
3. This is my top choice in handling the situation.  Partner with AT&T to provide an iPhone 4 credit on the accounts of anyone who bought the iPhone 4 and simply bought a case, or wants to buy a case for their phone and be done with it.  This would likely fix the problem for the majority of the iPhone 4 population.  For those that do not want the quicker fix, offer to fix the device if the user sends it in.  If Apple clearly lets their customers know that the fix may take a week or longer, then the amount of people who actually send their phone in will likely be reduced significantly.  Ultimately this approach would allow them to quickly compensate for those who've already bought cases, provide a case for those that would like one, or recall the devices for the really difficult customers.  Either way, this would likely provide the best solution for their customers while having less of an impact on their pockets.