IOS5 Wifi Sync Problems

Okay, so I have been having an insane number of problems getting wifi sync to work. It gets to "waiting for changes to reconcile" and just sits there. I read somewhere that syncing a podcast fixes the issue, and it did, but just once. Once I tried to sync again, it locked up. I also read somewhere about something with iPod photo cache in iPhoto or Aperture. I don't sync photos to my phone, but I tried deleting the iPod photo cache anyway to see if that did anything....it doesn't effect it at all. I was thinking this would be a huge bug, but a google search only returned 5 results - 4 of which were porn sites.

Would reinstalling OSX help? I don't have much data or software on my Macbook since its pretty new, so doing this wouldn't be a huge deal. Is it even possible that the OS is causing this issue?