just use infuriate,which is oGCD and onslaught is too, so you can tomahawk>infuriate>onslaught (its almost the same as having it from the get go). yes its a 5y difference. does it stay this way in shb, didn't pay attention to tool tips regarding the range?

so in my opinion your proposed skill change is not needed.