We will do the same, probably arrive Tokyo 5-7 days prior to embarkation, previously visit was to Kyoto/Osaka and Hiroshima, this time we will spend more time in Tokyo before joining the ship. We booked this version of the "Have it All" deal while onboard our last cruise including gratuities...