Wow, you guys are fantastic! Thank you all! I especially love the idea of hairdrying my pastry to give it a refresh!
I am not a huge fan of either green tea or coffee so I plan on taking some good old English tea bags with me. I assume (perhaps incorrectly) that I can obtain some milk from the hotel room service.
For the first part of my stay I will be right by Tokyo station, so any bakery suggestions would be fantastic. I do have breakfast included at my first hotel, but not at a couple of the hotels later on in my trip (Kyoto, second half Tokyo).