I did get off the monorail at terminal 1 and realized that ANA wasn't there so hopped on the next monorail to terminal 2.

Not only was there no problems with taking liquids onboard, coming home I was never asked for ID. I might have been able to do the same on the outbound but I offered our passport when checking in at Hamamatsucho Station.

As for additional carryons, they will not take them from you. They might come up to you at the gate and ask to gate check your rollaboard but they took no for an answer.

We paid the 5,000 Yen for upgrade on outbound (but it was not available on the return). This, I found, was useful when you check bags as they come off first. I would definitely do it again for the extra space, too.

Marc