I'd make the decision largely on the NRT limobus schedule. If it works from the PH/HR, either stay there or move someplace nearby (that's likely to be cheap). Similarly the Andaz is nice, so go there if you must move and it the airport transportation (by limobus) schedule works.