And will be in Tokyo, then I have two places you should definitely visit!
Having just returned from a ten day trip to Japan, I'm happy to report that I have found two lolita hotspots, if you would.
First, in Shinjuku, at the Marui One department store: the top floors are dedicated to lolita!
You can find the following stores: Angelic Pretty, ALGONQUINS, artherapie, ATELIER BOZ, BLACK PEACE NOW, Coquettish*Tiara, Emily Temple cute, EXCENTRIQUE, JESUS DIAMANTE, metamorphose temps de fille, Moi-même-Moitié, no future, PEACE NOW, SEXY DYNAMITE LONDON, SUPER LOVERS, and YOSUKE.
(Mana's line is hidden in a store call Kera Angel.)
Second, in Harajuku, at the Laforet department store: in the basement, floors B.5, B1.5, and B2, are dedicated to lolita!
You can find the following stores: Swimmer, Putumayo, Angelic Pretty, Black Peace Now... And others (Sorry, I can't remember them all! sweatdrop )
Loli Dollies' Vanilla Entourage (lolita)