I agree there is room for improvement. But the throw back to Zelda 1 structure is the right direction to take I think.
I've been hoping for Nintendo to do that for quite a few titles now. And now that they've done so, I'm, hoping they stick to that for a while and polish that design over the next few titles.