For Darkforge, I have an idea. Split the current weapon room into two separate rooms with a wall between them, then add two more rooms that are also 4x4 in size, and resize the pool room to be 4x4 in size...
Then randomly choose which of the rooms is a weapon room (x2), an armour room, a pool room, or a danger room (x2). The danger rooms would house a heap of steel golems, so teleporting in would mean you're surrounded by them.
Oh, and make item detect and monster detect fail in Darkforge, so players can't just detect the right room.
Griff's grave can stay where it is, with teleportation an option. I don't see a need to change that one at all - it's an early game task, let it stay a little easier for the "easier" classes. But the graveyard level itself should have a bit of randomisation, so that the player has to find their way through the left side of the level.