Just tried it again, and it seems to be going much faster! Nice.
Is there a way to get through flooded rooms? I keep getting to the point where there's no place to go except through a flooded room, but I have yet to get across a flooded room and open a door without drowning. Am I missing something?