Ex-Diageo CEO Paul Walsh is to stay with the company for up to another five years to promote the company's Scotch whisky interests.