Can't have prime era Floyd without either of them. So I'd say both. Although I don't think either would like that. Gilmour for musicianship, Waters for lyrics and ability to conceptualize.