I actually enjoyed the Water Temple quite a bit. Changing the water level to get about the dungeon was a nice feature that I'm glad Nintendo took advantage of. I suppose it could be annoying to you if you forgot a key somewhere, but if that was the case it was really your own fault that it was...