I've found it's easiest to just wait it out and continue using Office 2010, hopefully by mid 2013 they'll sort it all out.
I've stopped using the Office 2013 Preview (especially Outlook) and content to keep using Outlook 2010 connected up to the current Office 365 environment, until such time.