Fitted braided front hoses. Don't seem quite right but they'll do the job. Put some really awful mirror brackets on the bars to hold the handguards, and screwed some genuine Yamaha fairing screws in. Only one tool needed to remove panels now.
Tested all the electrics, gave it a bluff good once over- I think she's ready for an mot tomorrow.