Agreed. I don't think A&E will be around very long, they have terrible attitudes in the film when you break it down.
I also agree with you about DHS, which makes the placement of a permanent Frozen attraction there seems like seem like the most absurd to me. Throwing in another E ticket ride while disregarding the theme of the theme park is like putting a band aid on a gunshot wound.
I guess that's why minimally invasive Frozen overlay of Maelstrom makes the most sense to me. It is geographically acceptable to see Frozen characters in the Norway pavilion, and maybe in some way, little kids that are fans of Frozen will learn about Norway, which is what WS is all about anyways. Plus, it's going to make Disney MEGA bucks, and that is something I can not hate.