My advice is to do the renewal without having to go to the border to face capricious judgements by under trained by all powerful border staff. It is possible to do the renewal early and via mail at a main immigration office. Now this information could be dated and please seek the advice of Mr. Roberts for current methods.