The original's better than the upgraded one in all ways except for the ninjutsu and crit rate percentages + clear debuff.

Original experimental ninjutsu allow watermain to skill every turn. The upgraded one does not in certain usage situation (The cooldown caps at 1 turn, but being activated right at the start of the turn meant that it activates after the natural countdown to 1, the skill won't trigger then).

Since the upgraded one has quite differing functionality, would it be possible for future feature to allow players to choose if they want the unlocked upgraded version or not when setting up their talent tree for that particular setup?

EDIT:
Solution 1: Allow player to choose upgrade or basic skill in their set up for each individual skills. Currently it is all or nothing (The elemental release set unlocks or the full basic set).
Solution 2: Set the upgraded Experimental ninjutsu to trigger like its basic counterpart. So instead of at the start of each round, turn it to at the first action of each round/when it is the character's turn. This would ensure that the upgraded skill won't be inferior compared to the basic version in terms of skill cooldown reduction.