Sounds like you just need a HP checklist, etc. Don’t panic, you have plenty of time for two Potter days.
This plan/checklist mostly follows the timeline:
Here are maps that also cover all the things:
Hogsmeade Map.pdf (6.4 MB)
Diagon Alley Map.pdf (5.9 MB)
Here is a WWOHP Scavenger Hunt if interested. And the Answer Key
Also, Butterbeer Types and Locations
There are some other general tips on the Community Page too, look for the Diagon Alley and Hogsmeade section.
I may have missed something