You're first mistake was in your first post. O_O
You cannot use Hurricane Fist to avoid everything. Sometimes it will come in handy but not always. Hurricane Fist is great to dodge laterally because when the attack passes you it will have no more effect on you. And it also works on some large scale attack that if you get out of range it won't effect you... but not this one. What did I tell you? The jutsu list lies. O_O Though the technique itself is short to mid, it completely depends on the amount of water he summons. If he summons a glass of water will it reach you at mid range. It should the way you described the technique, but no it really doesn't. If he summoned a massive amount of water, a lake's worth, as much as Kisame summoned, it should reach you at ALL RANGES. Look at Kisame's water summon, it was gigantic. It was so huge it could be spotted from far away. You have to expect the worst, which is that situation. Using Hurricane Fist is useless. Plus why the heck did you use it twice... he gave you the opening by standing on the wave and bending down putting his hand in the water from his next jutsu. You should've used a whirlpool technique to drag him into his own water. Use his jutsu against him like I told you. The instead of Gian, you should use the water electrocuting jutsu to immediately electroctue him. I would've done a sequence such as Earth Fissure big enough to drain all his water, and perform this jutsu while jumping back but still within mid range but farther (I'm blocking his jutsu so jumping back can't be called as avoidance), then the whirlpool + electricity combo.
Do you understand? O_O
Also, I want your opinion on your own move. State any mistakes that you think you made that I didn't mention, and mistakes that I did mention. Tell me how you were planning to use them in your own way, different from mine.