Not all songs/artists syncing after updating to 12.2/iOS 8.4

After performing the updates on both Mac and iPhone 5s, I have been unable to sync all checked music in iTunes. When looking at 'On My Device' in the left hand pane in iTunes, the number of songs doesn't match the amount attempted to sync. You can also see the GB amount change as the phones syncs. I have read there is an explicit content issue but allowing that under Restrictions had no effect. I also attempted to manage Match, Online and Offline iCloud settings to no avail. The only thing that worked (partially was signing in and out and in again on iTunes on the Mac. I went from 266 out of 681 songs up to 466. Waiting for 8.4.1 in 3....2...1.....

This kind of thing wouldn't happen under Steve's watch.