SH2 was more open, but I can't remember having many options for the route from the first encounter to the apartments.

Something on the lines of Monkey Island's three trials would be neat, where you had a bunch of stuff to do but could pick the order. Even if you had to do everything to progress, it'd still be a nice touch.