If you're willing to sacrifice the stock windshield, first try just cutting off the upper edge with that stupid recurved forward flip. That's where the turbulence is generated. I replaced my OEM with a Rifle, which has no recurve and it is smooth as can be. I then trimmed it down a little at time to get it the right height. Then I cut off the upper corners a little at an angle and now it's perfect (for me). I cut mine with my 14" Delt bandsaw, but not everyone has those. A Demel tool will work, a fine blade in a saber saw or a fine coping saw, etc. Masking tape on the edges to help control chipping and scratches, cover the rest with thick paper or layers of newspaper, file out the saw marks, finish with 600 wet paper, and/or some good plastic polish, or jewelers rouge to finish the edge. Sand it with a sanding block, not your fingers.
pic below