I think the detuning of the organ is a little much, perhaps you could have it fade into being detuned in a certain part of the song? With it being there all the time it's kinda distracting, I guess you could say.
I like the water bit at the end, it works well with the song and with the level it's remixing. Whether cliche or not, to my ears it works.