After resetting the ipod and clearing all the data and settings, I restored my iphone using the last backup. It worked! All my apps are running. Strangely enough, it didn't restore my email settings and some data from some of my apps was missing.
Wouldn't it have been brilliant if Apple had made the iphone so as soon as it was connected on to a wifi network, it gave you the option of joining a neighborhood or showed up as a webdav connection on your mac. Then all you would have to do is drag files onto the iphone on your desktop to move data and apps around.
Well it isn't integrated, but the Files iphone app is pretty cool. Last night, I installed it on my iphone. It turns the iphone into a webdav server so you can connect to it in the network neighborhood or in your mac shared connections. Drag and drop files onto the connection on your mac or pc and the files transfer to your iphone.
On your iphone
You can create a folder structure on your iphone and then that structure is exposed as shared and shows up beneath the network connection. You can pretty much open and view all the files types that you can as mail attachments on your iphone.
At this point, since the iphone doesn't really have a shared file structure, other apps can't see the files but that should be the next step.
Two nice things: You can turn the webdav server on and off at a touch of a button and you can see the ip address that the iphone is using to make it easy to map network drives to it.