Further improvements to veteran's Infiltrate (make Overwatch part of the base ability)

I like what FS have done to it so far. Merging the +30% damage buff into the main node was a no-brainer, a niche underperforming Ability having 4 subnodes before that was just mental. But it still has 3 subnodes while VoC, the best Ability of the veteran out of them all, without doubt, has just 2. That’s a bit too much tax for what it does, don’t you think?

Suggestion: make Overwatch sub-talent part of the main node too. So, basically, from now on Infiltrate always has 60s CD, and 2 charges.

I mean, does anybody choose to run Infiltrate with only one charge willfully, and not because they can’t afford to spend a talent point there? IMO, having 2 charges trumps somewhat shorter CD by far, in this case.

This also would further refine its identity, in comparison to Zealot’s Shroud. Zealot’s shroud would be all about damage dealing, a single devastating hit. While veteran’s Infiltrate is more about utility, doing various things (assisting, ressing, saving teammates, pulling levers, pressing buttons, solving puzzles while stealthed, deploying grenades in a middle of a hoard etc) - thus it would benefit from having the extra charge all the time.

And it would free one talent point in many Infiltrate builds to spend on something usefull, those builds are far from being powerful, they could use a bit of help like that.

EDIT:
Adujust suggested CD for Infiltrate from 45s to 60s, as I didn’t specify it correctly before. 60s is calculated as the base (current) CD of 40s plus 50% increase from the Overwatch this proposal suggests to merge into the base Ability

EDIT2:
Yea, I agree with others posting below that CD is kinda huge for what it does. With 2 charges though it’s not that obvious as with just one. FS could start with the suggested merge, and then adjust it further if needed

Especially on vet with it’s two “on combat ability activation” triggered skills I think a shorter cooldown is way more beneficial than having two charges. Infiltrate still having such a long cooldown weirdos me out.

The masochist in me wants the gratuitous effects of it trapped to modifier nodes that can’t be run together. They should add a new node, ‘Inspired Orator’ that gives the shout the heavy knockdown effect on elites and boss stagger, with slightly more range. The existing ‘Duty and Honor’ is the same, but the base knockback effect is only the minor stagger like ogg’s taunt. No ogryns on the floor.