For the first you could use a virtual tag.
e.g.
$IsNull(<Set subtitle>,<Album>,<Set subtitle>)
Then use that tag to display the Album title (or the Set subtitle when present)
For the second, you could customise the Album and Tracks panel and activate 'track subgrouping'.
You could use Disc# for it, or a custom tag.