Well right now I have no headlight setup, so I much prefer yours!
Let me correct: "The only thing I'd like to do now, apart from getting the new tank on there
& paint my rad covers black, is to swap my handlebar clamp for the old style so that a little more of the handlebar is exposed."
btw, I had to go back to the pics to see that your tank is damaged

I am considering keeping mine damaged, to make it obvious that I not only work on my bike, I also ride it... and for a streetfighter look, it may work, we`ll see. I think it looks badass on your bike too as is
How do you like riding naked?