Instead of having Sokoban as a branch, occasional Sokoban puzzles should generate in the Dungeons proper. It must not be mandatory to complete them to pass through the level.