Idea for Yasuo rework

Before, I had an idea that turned Yasuo into somewhat of an energy-based champion. However, as was proven to me by another member of the forums this would be bad for him as a Skirmisher because they're made to be extended battles -- energy that runs out would be counterproductive for a Champion that needs to stay in extended battles, so unfortunately that basis was out. Then, I suddenly came up with what I thought was a brilliant idea...one that fits with his core aspect as a samurai and fixes his gameplay up. The idea, for those tl;dr fanatics: instead of Intent and Resolve working at the same time, instead make them work separately. Let me explain, for those that actually like reading. Yasuo has both Intent (which gives him double Crit Chance at the cost of reduced Crit damage) and Resolve (which fills up his "Flow" meter and gives him a very temporary but strong shield when he's damaged by a Champion's attack or ability), and normally these two abilities are active at the same time -- this means that Yasuo has double Crit Chance at the same time that he has a shield. This is one of the main things that makes Yasuo supposedly "broken": his passive makes fights very safe to get into, and thanks to his E he's likely to have a semi-safe escape as well. However, what would happen if his double Crit Chance was disabled while his Flow meter is full? With this small change, Yasuo loses power when he plays passively. When his Flow meter is full, he loses offensive power but has safety in the form of his Resolve's shield...but when his shield is popped, he snaps back to double Crit Chance and is given the ability to immediately go on the offensive at the cost of losing his defense. Like a samurai, he resolves to stand back and poke out an opportunity to strike while at maximum Flow...then once he jumps in and his opponent attacks him, he discards that passive resolve and becomes fully intent on slaying his opponents. Of course, to make this change worthwhile his Flow increase would have to be slowed drastically while he's in battle against a Champion; losing all offensiveness when you're in the middle of a battle is worse than having to rely on energy as a Skirmisher. Still, you wouldn't stop gaining Flow...not only does gaining back Flow let you go back on the defensive quickly after battle, but it also helps to limit exactly how far you can go in battle until you have to lose your shield again. Battles on the Rift are fairly quick...if you're in a battle for long enough that even with having drastically reduced Flow restoration you still gain all of it back, then you're either in the Laning Phase against a very pushy opponent or you're missing objectives during Late Game. Note, though, that I made it so you only get reduced Flow restoration against Champions; it wouldn't make do to be forced to miss farm simply because you want to fill your Resolve again, and since minion damage doesn't activate nor affect his shield it would be a bad idea to hurt him like that. Also, even though it's best to have his shield pop against monsters it would be a bad idea to slow his Flow gain against them because he's still a squishy melee Champion...not only that, but having normal Flow gain against monsters actively makes poking monsters beneficial, and in a place on the map where battles and invasions can come out of nowhere it's good to have that defense up when you need it. So, at the end of this, the point is simple. When Yasuo isn't at full Flow, Intent's double Crit Chance should be active; when Yasuo is at full Flow, Intent should be inactive until Resolve's shield is popped. While Yasuo is in battle against an enemy Champion, his Flow restoration should be drastically reduced to avoid loss of offensive power when it's needed most. These steps, in my opinion, should at least be a starting point in fixing Yasuo's kit and helping him become a Champion that is pleasing and exciting to use and battle against.