I'm always surprised they haven't built a larger Universal Store at that location. The current location is too small and out of the way. It seems like that power corner would be ideal for a bigger, better Universal Store.
Overall it feels like the retail locations at both parks are too small, and creating a giant store outside in CityWalk would be a great way to alleviate some of that.
Then, add a preview center component to the store, or put a preview center in the current Universal Store location.