GM4Him makes a good point in that map reworks are unlikely. Perhaps we should be thinking about smaller tweaks or alterations that could minimize the theme park effect rather than reworking the map? I'm a bit at a loss though, so I'm just proposing an approach.
