For rust find something that eats the rust.
Go to a car cleaning shop that deals with older cars as they should have special polish to revamp up the paint.
I have done this on several of my bikes and the results are very nice.
You'll be amazed how nice and shiny 'old' paint can look like when doing this.
Do not go to a carpaint shop as they used not entirely the same product as they treat new paint and yours doesn't.
Show us the results.
Good luck.