well i have the same bike and im in the same boat... i took off the front cowl and headlight yesterday, and am considering moving the speedo up on the bars and puttin a round headlight on the forks.... kkind of street fighter look.. of course lots of wire shortening to do... pics?
See if you can locate an aftermarket full fairing. I have the Lockhart fairing on my bike and I know there were other options. I believe that AirTech still makes and sells them unpainted. Check out my photo gallery if you want to see what it looks like. It definitely makes it look more modern.