Thanks all for your great ideas :-)
I think I'll start with braided lines and see how they go.
For info, I know the brakes are not crap, it's just after riding the demo 1000 at a dealer, I was shocked at the difference in power.
Lots of very useful replies from everyone !