I came across this rather nice tea house near Harajuku. It was the Empress’ tea house. Although I don’t think she comes by any more.
Green tea flavoured things are everywhere in Japan. A particular favourite is green tea ice cream. This tends to be of a “whippy” style but is actually very nice. It is reasonably hard and isn’t too sweet.