You can get em to throw in the harness and the switch now, and take your time with the lights -- you might get some other ideas about lights later (e.g. LEDs).
Btw did you check out any aftermarket exhausts?
Lusting for: Currently Sated with the new XCx
Current: 2012 Berg FE570, 2010 Street Triple R (wifey), 2015 Tiger 800 XCx -- O YEA!
Sold: 1975 CT90, 2008 XVS650, 2007 Rocket III Classic, 2010 Rocket III Roadster, 2011 800 XC