I separate English and Japanese
I then have a folder for each artist
In each folder, I have the artists' releases and release dates (I don't differentiate between what is a single, mini-album, album, etc)
If I have to make changes to the tags, I do it in iTunes and just drag the new version into the folder and overwrite what was originally there.