Cheers guy's.
I was looking at a Yambits halogen which should be a straight swap. I decided that I might struggle to get this to fit the rims I have and they are quite different. I did buy a headlight from a GS450 but it wasn't that good.
I ordered a complete, pattern, wetdream headlight unit earlier. That should mean that I can either use the whole unit, use the rims and glass if it fits the headlight holder or just use the glass. It has a 12v 60/55w H4 bulb so I ordered a couple 6v 35/35w H4 bulbs to go with it. I needed one with a pilot light so lets see what turns up.