Man this quest is bugged to oblivion (ES pun intended)
I had the same water pouring problem, then I managed to fix it with console commands, only to get stuck on the next bit. 3 of the stages had been set to completed that I had not yet done, so.., I had to go back to my earlier save, and seeing...