I removed the whole twin headlight, brackets, and windscreen from my STT, and put on one 6" (should have gone 7") headlight. I believe it's less wind and definitely less buffeting for me at 6'3".
I'm not sure with your windscreen, mines the tall one but I removed it too. It's a bit windier but I like it, I found some plastic covers to block the holes and life's good.
Make sure you use good quality rubber grommets on the mounts, I used plastic ones and shattered this acrylic fly screen. Madstad replaced it for free but I then used the same rubber on the mounts that is used for the Windshield.