For those who want to play the piece: I've been playing it this afternoon, and I feel it just doesn't work as a waltz, even with some modifications. It gives a great feeling of being on the sea, or in a giant landscape, but it just doesn't sound like a waltz.