New Bars - Clubmans of course

So I figured I'd start with the easiest things first and work up to the more involved modifications - so I figured I'd start with the bars.  After all, what could be easier than a simple bar swap, right?  Wrong.

As it turns out the clubman bars interfere with the stock fairing on the bike, which houses the turn signals, gauges, and headlight.  So I figured I'd better start pulling that apart and seeing what I can make work.  Everything comes off as one unit.  The turn signals are mounted to the tree via a bar and then the fairing, which houses the gauges and headlight, mounts to the turn signals.  So now I'm left with a rat's nest of wires and need to buy a headlight, mounting brackets, turn signals, and either new gauges or figure out a new way to mount the ones I have.

Here's the damage so far:

Once that was done I did manage to get the clubman bars put on, but with one problem, the brake line is too long and the master cylinder is sitting at an angle on the bars (not sure if this is a problem), so there's a sharp bend in the line immediately coming off of the cylinder, which isn't good.  The good news is I think I should be able to get about $100 for the fairing and signals on ebay, helping to fund the new headlight and gauge mounts.

Taking things apart is easy, it's the whole 'putting it back together in a good-looking and working order that seems to be a little tricky...