WWOHP is an old-school theme park experience, tho, in that it is best savored, taking in all the small details. Rushing to Olivanders, then through Dervish & Bangs on your way to the single-rider line defeats the purpose. Take your time, take in everything there is to see. Just "live" in Hogsmeade for a few hours.
With two daysand express pass, there will still be plenty of time to do everything else in the parks.