Dan
Tipping is almost considered rude! O miyage..........small gift giving is appropriate as a show of appreciation. You will see tons of shops with little gifts to give. Better yet bring things from your culture with you to give. As far as the hotel my opinion is you are only sleeping there more space does not matter. Save the money for the BEST sushi you will ever have $$$$$$ in Ginza called Kyubeii. Have fun be safe!