Dbpoweramp usefully recognized multi disc sets which helped in my folder structure when doing format conversions. Also I have two broad folder schemes for secure and insecure rips and when multi disc sets get split across these I could miss a disc folder.
hmm I don't have insecure rips very often but it still will recognize multi-disk sets and multiple format conversions depending on the mask and your personal directory scheme.
I prefer
\ARTIST
\ALBUM
\CD1
\CD2
to \Artist\Album CD1\
\Artist\Album CD2\
if that suits you just the straight Disk# works very well, you just have to edit the Album title prior to the rip of the multi-cds so that it is the same for all CD's
this is the mask I use
[IFCOMP]#2 - VARIOUS ARTISTS\[album] [IFMULTI] \CD[disc]\[]\[track]_[title]_[Album] _[artist][][IF!COMP][IFVALUE]album artist,[album artist],[artist][]\[album] [IFMULTI] \CD[disc]\[]\[track]_[title]_[Album]_[artist][]
This works for both compilation and individual Album Artists if you want to try. Should be pretty easy to sift through insecure rips unless you are doing it industrially with some auto-ripper
Otherwise try the custom tag mapping to JRiver tags I mentioned, I think it would work just no time to test right now.