Steve,
Re your photo's of your long time bike. I love the blue fire flake, sweeet! I can recommend using rustkill on the disc surface, this neutralises the rust and does not seem to affect braking performance. I use the type of rust preventer that is used o beare metal panels etc. Just dabb some on a rag and rub it over, when you pack her away, after getting caught in the rain or near salt etc.
I noticed your oil cooler on your bike, I don't want to sound like an no it all, or anything, but I would be worried about blocking off cooling to the exhaust valves and head where you have it located. Otherwise mate I could bo fault your bike, beautiful.
Regards Rich