Syncing music from Windows Phone 3.0 (OSX) to WP7.5 phone?

I downloaded the updated version of the connector yesterday and I had to resync everything, only to find it only copied about a third of what I had on the phone before. So I deleted all the music from it and now it won't sync anything back....the app says it does but nothing shows up on my phone. How do I get around this, it's becoming a nuisance and I don't want to go back to my iPod for music. I'm using a Lumia 800 on the latest software (or so it tells me) And for everyone that wants to be funny, getting Windows won't "fix" it for me, let's not start an OS war.