Yeah it is frustrating, but that may as well be common knowledge now.
Besides, Ocarina of time had the most annoying water temple.
Majora's mask's was a lot easier compared to it.
Twilight Princess' was pretty straightforward.
As for windwaker, I don't consider any temple in it to be a water...