KEMIMOTO Motorcycle Windshield Upgraded Aluminum Metal Heightened Windshield Extension Spoiler Clip Universal Adjustable Extension Clips Clear

This is the one I put on my stock screen. I was really surprised with the quality. It's been great. https://a.co/d/01xWjDvj

Not feeling cramped at all, unless I shift forward in the seat. I tend to sit back towards the rear of the front seat but sometimes on long stretches I sometimes slide forward, “cuddling” with the tank. In that situation I feel like the bike is a bit small for me. But nothing uncomfortable. For the buffeting I ordered a windshield extension on Amazon. Will see if that helps. https://a.co/d/0dvJb01b