The fact that you are only seeing Other in th content bar, and other things I have noticed, seems to suggest that iTunes is not properly recognizing content in iTunes on the Mac.
When I try to sync, it hangs on "Importing Photos" or "Analyzing Photos", but it does not import anything. I have 1.03 GB of photos on my 4S. I also have 13.48 GB of music on there. When I change the settings to not sync any music, it pretends to remove it, but all the music is still on the 4S.
For several syncs after that, the lie persists, and when I try add anything else on it gives me a "Over Capacity" warning. It seems to by itself change my settings to add in the music and the over capacity amounts indicate this.
May I suggest calling AppleCare and opening a case? They generally allow free help for 90-days after a major software release. If they want to charge you, just decline.