So I've revised my "map" using the other leaked blueprints to actually have a sense of what's inside the buildings.
Weasley's Wizard Wheezes seems to be a separate shop from Quality Quidditch Supplies. Quality Quidditch Supplies, though, does seem to be attached to the "flying" broomstick photo/video op, although they might still be "separate" stores (like Honeyduke's/Zonko's).
Flourish and Blotts is still a mystery. Is it a real shop? There's room for it to be, but they didn't announce it even though it is in the virtual walkthrough.
Number 6 is still a mystery too. Concept art indicates that it's Scribbulus, but TPI says Scribbulus is elsewhere (next to Wiseacre's) and the webcast video indicated that Scribbulus is an actual shop and not just a facade. The virtual walkthrough says #6 is just a facade for a yarn(?) shop. Number 6
could be an actual shop, but if it is then it looks like you exit Ollivander's through it. Would you exit through a yarn shop? Or a writing supplies shop? Exiting through a wand repair shop (the facade next to it) makes more sense...
Ollivander's seems screwed. I think Teebin said something about it earlier, but I can't see how it is really going to work. You enter through the doors labeled "Ollivander's" and are inside what? A shop? A queue? If it's a shop, it's not the same "shop" that the show is in... and once you see one of the three shows you exit back through the same shop?
As has been said before, there is definitely
something between Florean's Ice Cream and Borgin and Burkes. There could also be
something in between Florean's and Madam Malkin's, (although it could just be storage).