McGair: Rich Hill to return to Red Sox organization next season