cai + water

I was driving my 01 Integra SE with a Generic air intake withought the
air bypass valve in hard rain. I didn't know anything about
hydrolocking..as i was reving over 3k the car started bogging and
bogging then i saw black smoke coming out the back of the carr through
my rear view, so i pulled into a side street and the car stalled. I was
thinking distributor caps or plug wires, but after a lil research on
the internet I discovered what happened..the car hydrolocked. It is
real, I guess i'm lucky the engine wasn't damaged. Now I am very
careful avoiding every possible puddle :P...I'm thinking about gettin
an air bypass valve to prevent future occurences or just disconnecting
the lower pipe and sticking the filter on the first pipe coming the
intake. I live in canada and winter's really slushy and snowy so i'm
sure it could happen again driving throught that ****.

so what i'm asking is:
air bypass valve? or installing the filter directly on the upper pipe
and removing the lower pipe during winter.