Do not use circular motion for your final finish. I don't use it even for removing nicks from the edge, instead I use the X pattern, on a 800-1500 grit sandpaper.

I think this keeps the angles...