Maybe just one point/caveat I could add for your planning is that most, if not all, major departments stores close pretty early...
the ones in Ginza & Shinjuku between 7:30p.m.~ 8:00 p.m., in Nihonbashi 7:30 p.m.
Early closures go for a lot of retail shops, too.
I've met many visitors who were looking forward to/counting on after-dinner shopping only to be disappointed, finding everything closed after finishing off their desserts.