Yeah, multi-disc sets can be a real hassle. This is because the online databases (that source the metadata) are often very inconsistent, as your example illustrates. I realize that you need to correct the ones you already ripped, but for future situations, the easiest solution is preventative: As you rip each disc in a set, you need to review the metadata and ensure that the ALBUM name, as well as your folder structure, are exactly as you want
before hitting the Rip button.
For those already ripped, you can make bulk metadata edits in Windows Explorer. I'd suggest opening each folder (representing a disc in the set), and selecting all files (CTRL+A). Right-click to get the context menu and select Edit ID Tag. Once you're in there, you can change any of the tags that are common to all files...things like ALBUM, DISC, etc. Do this for each folder in the multi-disc set, ensuring that the the ALBUM name is as you want it for all, and the DISC tags are set appropriately. Then, of course, you can also rename the folders to give them a more consistent "look" in Windows Explorer. (It won't matter to your players, since they use the metadata, not your folder names and structure.)
This is also a good way to go back and add the remastered designation you want on those albums already ripped. So for example, go into the folder, select all files, Edit ID Tag, and change the ALBUM tag to
This is the Album (Remastered) or however you want it. But again, the easiest way to deal with these things going forward is to review and change the tags as needed before you rip. The less to clean up afterwards, the better.