Excellent info so far, any other comments, particularly on the upgraded rooms? Commonly in Japan, the first level upgrade just gets you a room on a higher floor -- this isn't worth extra to me, if that's the case.
Incidentally, if you want to stay in a LARGE hotel room in Japan, I can recommend two Tokyo properties: the Westin (Ebisu Garden Place) and the Park Hyatt (West Shinjuku). Both are pricey but very good, although the Hilton Tokyo, Century Hyatt, and Keio Plaza Intercontinental, all at Shinjuku, despite being older, are fine for their price range.