My tenere was exactly the same ( buffeting ) but I found most of it was coming
From slopes at front of petrol tank. I blocked under headlight with white
Perspex just above tow hook and it is a totally different bike,no buffeting at all..
As your riding just put your hand at top of slopes and you will feel vortex coming
Up towards your head.
Just what I found worked for me.