Modify Sokoban maps so that a monster can never get stuck in an awkward place except by the player doing something foolish. Possibly make the corridors leading to the goal double-sized or have alcoves off to one side where a monster can move.