I just installed the service pack so I am completely up-to-date now (I must have missed it before). I also realized a WAY easier way to get all the shipping addresses back. I opened up the data in OE from last nights back up and exported the shipping addresses. Then imported them into the repaired current data today. Saved a ton of time.

I would still like to know if there is a solution to this problem. Thanks.