McGair: Rich Hill to return to BoSox organization next season