Small update, fiddled a bit with the windscreen again, this time mounting it more in an aerodynamic position. Still being helmet buffered like crazy but a small 20km test ride with and without gave an improvement of about 10%
Tomorrow I'll do a longer one to minimize the variables.