My listening habits are much better when I listen to downloaded music than when streaming.
I find this too. If I listen on my iPods, I listen. If I have Apple Music playing, it's just audio wallpaper. I break out The Good Headphones and choose something from a finite selection of music that I've curated, and I'll sit there and enjoy it properly, without the temptation to scroll the internet while I'm doing it.