Reading through some of GKIDS' comments and it appears that both disks will include the director's cuts but not the original tv show episodes, which for the ADV version is a pretty significant issue, as their DC dub for that had to replace several of the original voice actors, resulting in an often disorientating viewing experience. There should really be no issue in including the originals alongside the rest of the dub, which makes the situation rather frustrating. Honestly, I'd prefer to just have the original tv airing episodes for the ADV dub and have the DC's solely on the Netflix re-dub if it means the voice actors remain consistent.
I admit to being a little disappointed how evasive or non-existent some of the replies to certain lines of inquiries have been. Like, we've been told that the ADV subtitles are an 'extra', presumably only on the classic dub disks, but every question over whether those disks will be exclusive to this release have been deftly ignored. Considering there was talk of looking forward to answering questions once the release goes live, it's irritating to see how selective those answers actually are. I guess we'll have to wait until the second announcement to truly get clarification?