How tall are you? I’m a tad over 6’2” and get the same thing, mostly with head winds. Maybe you need the screen with the big kick up in the top lip.
Fork deflectors is what you want, they have Stainless HD ones, Plus try a Wind splitter screen, They have a flick up around top edge, HD have actually started making one this year, they work well,
These are the chrome fork mounted wind deflectors that stop the wind coming up from under the fairing
I ended up getting a 10” Windsplitter fitted along with the adjustable deflectors and a triple tree deflector. Reduced the buffeting by about 95% I recon. Very happy with the results.
They aren’t that ugly Tim. I may have a hunt around and see if I can find some.
Have a look at Freedom Shields in the USA. Ive had 2 of them now and highly recommend them. I'm only 5'7 and on my last Street Glide I only needed a 5' one. They are reasonably priced at $100 USD plus $60 USD for freight.