I also use spotify for my general consumption needs, for windows id reccomend VLC, the default audio player in win10 is bad and VLC allows you to manage your songs better, you’ll just have to do good folder sorting to have everything accessible. If you need mobile access you can always set up a plex server, not that hard to do.