I agree with everything you've said about combining things. It was most likely due to them trying to get it open asap. One of the cast members told us they are working on a MUCH expanded WWHP, with a life-size Diagon Alley, a working Hogwarts Express and more. I think I'll be content to wait and see what they do before I go again.