Seems that the easiest think would be 2 copies. One as individual albums, the other as a multidisc album. The multidisc would have all songs in the same folder with a common Album title. File names for the tracks would be something like "Disc# Track# Track title" and include Disc# in the tags.