I like what you have started with that fairing, it looks aerodynamic. As for the wind buffeting, you could try a spoiler that attaches to the top of the wind screen. I have heard of good results with them, I'm in the process of figuring out a windshield arrangement for my Honda PCX.
Here is one such example.
Puig Clip-On Windscreen Visor - RevZilla