Whereas I'm currently wondering how you'll handle Rock in the 70s? As Soul really starts to detach and become Philly/Disco I'm assuming if it would be featured on the Old Grey Whistle Test, then it's fine.

Oh disco has to play a big part in the narrative because you don't get much of post-punk, New Wave, and so on without it.