I know what you mean: I always prefer to get the shot 'right' in the camera, rather than trying to fix it in post processing. I hope you get your filters soon.
As for getting lucky with the water, I remember a saying: 'The harder I work, the luckier I get', or something like that!