Well, after some thought, I decided I'll save the water gameplay for another level and just alter the underground section and keep the lighting.

(Your suggestion about splitting the level into two wouldn't really work because the design of the level would involve going back into the underground sections at parts, necessitating backtracking into the water)