Ice Tipped Arrows Suggestion

Hey, so I am running an amazon build, which uses the elemental surges node.

I've been using the ice tipped arrows mechanic to generate the surges. Would it be good to implement something like a buffer, instead of bypassing the skill cooldown you increase the number of arrows buffed (Just like barrage) Or maybe it does skip cooldown but the arrows increase up to a cap. It is a good build overall but keep recasting the skill just to generate surges (even though i still have the buff hogs it a bit)