The first time I played OoT, I was about 8 years old. Like you, I despised the water temple, and put the game on the shelf for about 4 years. Then I picked it up, beat the water temple and loved the rest of the game. You should definitely play through it again if you get the 3DS.