Eric, if you decide to go for a bikini fairing, or maybe a handlebar fairing, take a look at the Skidmarx website ( www.skidmarx.co.uk/cockpit_fairings.htm
) and look at the Comet fairing for the CX500. It shows the rectangular headlight version, but they also do one for round headlights. They might be able to offer a fitting kit to suit a beemer. Price is good, too. I just bought one for £79.95 + postage.
Wish you a speedy recovery and good luck with getting your bike sorted out.
P.S. If you want to see what one of these fairings looks like fitted to a bike (my CX), then take a look at the 'Ryka's' thread, posted under 'Let's Meet Up'