It sounds like most of your bases have been covered, but as an obsessive Harry Potter fan, I want to chime in from the obsession side. Personally, I would only go to Ollivanders in Diagon Alley because that is the real one. Ollivanders wasn’t in Hogsmeade! I also have heard that Ollivanders is better than the one in Hogsmeade. Every time I go to Universal, I do a Harry Potter day and I always start in Diagon Alley so that I can take the same path as Harry, starting there and traveling to Hogsmeade. This is, of course, not a touring strategy, merely a fan strategy.
Also, I will note that I have worn a small fanny pack on Forbidden Journey, Escape from Gringotts and Flight of the Hippogriff and never had a problem. A small wearable pack like that will not be required to go into a locker, and this can make a huge difference in the time you waste in the locker area.
I will agree that you should wear whatever fun things you want to wear. I’m 42 years old and wore a robe and a tie and carried my wand around on my last trip in October. It makes it all the more fun.
Also, have you considered doing Shutterbuttons while you are there? I won’t bore you with the details if you already know what it is, but if you don’t, please ask!