Did several short runs just to test and I think there's something wrong with "Energy Surge"
Consistently doesn't get affected by it's own "Fast" trait or slot upgrades and/or boosts - only gives 1 Energy
But but does get affected by "Chain" upgrade - gives 2 Energy
edit2: after putting "Free" upgrade on "Energy Surge" it doesn't give any energy at all, so I'm beginning to think that it calculates based on it's own energy cost
edit: "Riposte"s description confused me for a good long while, thought that I would gain armor immidiately on gaining counter stacks, not that "Riposte" itself will get stronger