It's a beautiful image. Like you I have been "reducing" the white and black points a little more lately although that is still a work in progress. I do like the mood in this image very much.
As far as the foreground water, I can see where you might want to crop it a little more, but on the other hand if you do it will get that dark to light transition in the water closer to the bottom of the frame, and my personal feeling is it needs a little space much like you have it now. I guess if I were going to crop it a little more it wouldn't be by much.