I found it hard to find a decent replacement here in NZ, without using a totally different style, so I went for the option of added driving lights. There are some good posts about this. I painted mine black and used some more authentic looking nuts and bolts, and I am really pleased with the added light at night. Also, when I come to sell the bike, it is easy to go back to stock if need be.
Just a suggestion anyway?