Finally settled on a music set-up for my computer:
- iTunes for playing music I own, minus Apple Music.
- Spotify for streaming, minus music I own.
iTunes is the best local player, whilst Spotify on the web is a good thing and their player for streaming is also good.