Diageo has lined up a replacement for a long-standing member of its executive committee, who is set to retire.