It looks like this has boiled down to three areas that should all improve your situation:
1. Get a better fitting helmet. Icon, HJC, whatever, but you should take some time wearing it around in the store before buying and it should be tight enough that when you're wearing it and you grab the chinbar and wiggle it, it makes the skin on your face move - the helmet should not be mobile on your head. Generally, full-face helmets are quieter than modulars, but a really good (read: expensive) modular may very well be quieter than an inexpensive full-face.
2. Get a bigger windshield. I like to look over the windshield, not through it. I'm your height and I've had pretty good results with the Givi windshield on my Gen 1. The CalSci and Cee Bailey's are really nice also and have a big range of available heights and widths, but they're a good bit more money (and better material also). The Laminar Lip could be worth a try, but you can get the Givi windshield for only a few bucks more than the Lip. I've had the Lip on several bikes and it does work for me.
3. Wear earplugs (if you don't already do so). I don't ride around the block without them and virtually all of the serious riders I know follow the same practice. Buy the assortment from Rider Wearhouse or from your local safety supply vendor, find a brand/model that works for you and then buy a box of them so you never run out and there is no excuse for not wearing them. If you ride a good bit and don't wear earplugs, you will have hearing loss as a result, guaranteed.
I would love to get a new modular helmet because I wear glasses, but currently I'm wearing a Shoei RF-1100 which is very comfortable and pretty quiet. I'm sorely tempted to go all-in and get a Schuberth, but at $700 it's a big investment.
Pete