Yay! I'm not even going to bother posting the fsck results - rather hideous if I may say so, but all fixable. Now I connect and I still get the sync but this time it rebuilt the database and all is well now. Removing those newly-added tracks regardless and adding 'em back in smaller bunches this time.