Looks great . I have allmost same setup , little beafier lights ( China ) , BUT same switch ::012::
All connected by auxlight relay on headlight hightbeam ( yellow Wiré )
I went straight to the battery so I didn't modified anything on the bike, the light will be on only when I use the switch, if I get tire of it it will be easy to be removed