I did the Eastern Beaver (love that name) relay kit on my '06 Classic to avoid igniton barrel failure and it has made a huge improvement on headlight brightness. I didn't go with the on/off switch but will upgrade to it for ease of starting the beast. The PC8 fuse block is a also great idea and I have that on my mod list for this season.
Since you're pulling the tank and doing all the work anyway, why not do it all? But especially get the version with the switch...