I just use Groove on both android and windows. All my music is synced to both places and I can get music I acquired elsewhere onto everything by just sticking it in OneDrive
though its 70k points/year makes it the most expensive reward.
There is a glaring downside to that service though. I can't open the website to stream the music from ubuntu. The website just doesn't load.