I agree that on the current state with the level design it's best the way it is. But having new maps with theses constraint in mind would be interesting to test.
