Barney, the map looks fantastic, you've replicated the Noble version very nicely indeed.
I'm looking at the Film Wizardry Book, page 134 Revisiting Diagon Alley and it shows pictures of Fenrir Greyback abducting/kidnapping Ollivander and you can see that his store is next to Wiseacre's Wizarding Equipment.
Although it also shows that facing Ollivanders on the other side of the street going down towards Gringotts is Mr. Mulpeppers Apothecary, Slug & Jiggers and then possibly Quality Quidditch Supplies (QQS is definitely on this side as we see in PS but should not be this far down, this store may just have a Quidditch banner outside for another reason, perhaps quidditch match ticket sales).
Hope this helps and even better if it makes sense.
