Can you guys buff Shai's Surf skill so that you can use it till you run out of stamina? 

I understand this might be op in combat so I suggest it only be usable like this out of combat.

Considering Shai has 0% survival rate on a 1v1 pvp unless the Shai is geared and the opponent isn't, then I wouldn't say it's an OP move. It would be more of a convenience for gathering among other things.  At least let us use it on water ;)