I would not use Mugglecast as the basis of what is going into the theme parks (and I say that as a fan of the show). They routinely are way off when it comes to what is going on in Orlando.
Olivander's will definitely stay in Hogsmeade for now, with the one in Diagon Alley doing something similar to what Disney is using for Storytime with Belle and the Mickey meet n' greets. One main outside area, but several rooms for "experiences" inside, allowing for much more capacity.