I seem to recall the dealer meetings on the new model year are in late Sept. Someone will know that.
Forget about both of your hopes.
It's an adventure bike, wind management is not much of a factor. They slapped an adjustable windscreen bracket on the same old Gen I nose for the Gen II bikes, (bad idea, father forward does NOT help). And if you want 8 gallons, do what I have done. Fuel cell or an expanded OEM tank. Stark Welding in St George, 435-231-1820 /
starkweldingllc@gmail.com might do another one. He did mine, but it will probably cost you closer to $1k for the welding. Plus a tank, plus cleaning after the welding is done, (I had a radiator shop dip it to clean it fully), then paint or what ever you prefer. I had mine LineX coated by Red Desert.
I can point you to a fuel cell builder that does Super Ten fuel cells too. PM me if you want info.
Put some side wind deflectors on if you haven't already. They do help.
Who knows if Yamaha will update. It's still a little early for an update and they are focused on the 2021 release of the T-7 in the US. It will probably be BNC, (bold new colors or in the Super Ten, LESS color). Maybe 2020 will be the year where the only color on the Super Ten is the tank?