Both of these temples were a pain, but I found Ocarina of Time's water temple better. The Great Bay temple forced you to turn on switches, and that was boring. Also, if the current takes you away from your destination, you will have to backtrack all the way. Ocarina of Time had a neat mini boss and a cool item. The boss was also better.