I agree with both, specially with the safe rooms since that would give the player some breathing room. The teleport pads idea is also great, honestly I would directly make it so you can TP to rooms you have already been to from the minimap, but maybe that's giving the player too much power.