Yasuo's Crit Situation (and suggestions to solve it)

As you all know, with the recent changes to masteries, Yasuo has become somewhat OP. After buying only and , he gains 100% crit damage. Couple this with the Warlord's Bloodlust mastery and he an insane amount of lifesteal with every hit. Someone in the forums recently proposed that using the sweeping blade ability should cost flow instead of generating it. I feel that this does not directly solve the problem. Wouldn't he still deal the same amount of crit damage and gain the same amount of hp?

I feel changing the crit would hurt a lot of other champions indirectly, namely the ADCs it seems to be targeted towards. Therefore, I have two simple solutions to the problem:

A) Yasuo's passive pertaining to crit chance is removed Yasuo would be able to deal normal crit damage and benefit Warlord's Bloodlust but his crit would scale similarly to everyone else's (as in gives him 30% not 60%), therefore making a rush for and less effective. In my opinion, this would be the best way to deal with the problem. Yas is supposed to be a high-risk, high-reward champ. Making his damage more sporadic but possibly more deadly (AA's and Q's deal 100% crit) could increase his risk and make his gameplay more interesting. A more conservative (and perhaps better) approach could be to have the 75% modified crit damage remain on Steel Tempest.

B) Yasuo's crit chance multiplier is lowered to 1.35; AA crit damage modifier reduced to 75% (Steel Tempest to 50%) from 90% Yas would now only gain 40.5% crit damage from a and 27% from a for a total of 67.5. Prior to patch 5.22, a and would give Yasuo a total of 70% crit. The lowered crit damage ratios would be offset by the healing power derived from the Warlord's Bloodlust mastery. I feel this solution has merit as well. I had to find what I felt was a suitable number between 1.25 and 1.5 for a reduction Yas's crit damage modifier (1.5 wouldn't do much to solve the problem, 1.25 would probably be too much).

Of course, I'm not balance expert and these ideas were just thought up in the last hour but what do you guys think? (go easy pls I'm new xD)