I use iCloud, had a lot of issues to begin with but in the end i totally deleted my iCloud Library, waited the 30 days for it to all be permanently gone and then re-added everything from my mac, only allowed it to sync to iCloud after everything was added to the mac library, now everything works super smooth from both ends!