I havent played much with discogs, it seems to have more complete info about songs, but I think I had some trouble finding some of my tracks. For manual genre tagging, I tend to resort to genius which too has a lot of info.
Organizing my library can be kind of soothing
Indeed, I could easily do that if I had enough time. I kinda like organizing stuff and such.