Yes but would not have allowed the slow shutter speed to smooth the water.Nice photo, but you really should stay away from f/22. Diffraction has become a real problem at such a small aperture.
f/8 would have given you all the depth of field you needed, with minimal to no noticeable diffraction.
Then use a mild ND filter. e.g. a polarising filter will be 2 to 4 stops, depending.Yes but would not have allowed the slow shutter speed to smooth the water.