I'm in the same boat, but one extra thing I found that Apple Music does better is sound quality. I'm not an audiophile by any means, but even I noticed immediately that music sounded _much_ better, like, very noticeably.

But yeah, aside from that, it's kind of a miserable experience. Hard to believe it's _still_ so bad.