I don't usually plug products, but I saw an ad on tv that showed a scratch remover that you just rub on, then rub off. I figured it was a gimmick, but I thought I would give it a try before I got the old buffer out. It's called NuFinish Scratch Doctor. I had some pretty bad scratches and it did a good job of getting rid of them. I'll post a before and after pic. You can still see the scratched if you look close, but it did a pretty good job.

before:


after: