2: mightaswell go the valk route and give OHS a garanteed reset mechanic in other relevant skills
This should apply to every skill with random % chance of cooldown reset. It's so stupid that a player's DPS is reliant on a pure random factor (and I know crits are RNG too but at least you can influence those with higher crit factor).