Ended up fitting the Puig Up&Down screen.
There are actually two distinct ways of mounting it.
1) Use the optional OEM Ribelle windscreen mounting posts and mount the Puig support bars on the handlebars (what I did)
2) Use the holes at the back of the dash for the lower mounting point on the Puig, and use the holes for the OEM Ribelle optional windscreen for the Puig upper support posts.
I'm still not sure what's better, and I haven't taken it for a ride yet. Apologize for the mess in the background, lots of construction going on around here: