The solution for such a situation is called the Plex Dance.
In the case of music, you can omit step 4.
Other tips:
With multi-disc albums, store the disc number as a single number in its dedicated meta tag. Do not add the disc number to the “album title” tag.
Do also look out for empty “track number” meta tags. These can cause weird behaviour.
