I used spacers to angle back my stock shield and it reduced buffeting and wind noise considerably. I highly recommend trying it. It is cheap and easy to do and if it doesn’t work for you you are only out a couple of bucks for the spacers.
I had the same issue with my 16ES. The shift throw is too far. Coming from a sport bike, the excessive shifter throw was one of the first things I noticed when I got the bike. I solved this by replacing the shifter arm with one from an R6. It is about 10mm shorter than the FJR shifter arm...