iOS and Mac playlists no longer match

After updating to iTunes 12.2 and iOS 8.4, the number of songs in many of my playlists no longer match. Some are off by 5, some are off by 20, some 100s and some match perfectly. Album art on iOS devices is wrecked, which bothers me too, but not as much. I signed out of my account on all devices, turned iCloud library off then back on again but the issue remains. Is there something I can do, or just wait for an update. Apple Music was on at the beginning of all this but OFF now. I'd much rather stream my own library and playlists of 10,000+ songs than use Apple Music.