Honestly, the Plex app is very decent for music libraries these days. Except for oddball VA releases and obscure mixtapes I find Plex to often be terrific at library management.
Maybe time to give Plex a try for this.
I run all songs / albums through MusicBrainz Picard before putting them in the music directory structure so they're fully tagged. It only misses some of the more local / esoteric stuff I've got.