Tony, a word of caution with the lights, I have used the lights from ADVmonster as well, they are indeed very bright and the setup was similar.
Having used the normal light supports first, they cracked on my first ride. I know the 640 vibrates a lot more than the Yamaha but better safe than sorry. John from ADVmonster sells also heavy duty supports but they are easy to manufacture from 2mm SS plates ...
Looking very good and the KTM tower looks