I had similar problems and moved to Google Play. They still have massive gaps, but at least for me they're less massive? Play also lets you upload tracks, which

I had similar problems and moved to Google Play. They still have massive gaps, but at least for me they're less massive? Play also lets you upload tracks, which I confess I haven't done yet, but I should.