:iagree: on both points.
A coating prep polish like the one from Mckees37, or as another example, DP Coating Prep Polish, should be safe as they do not contain any abrasives. The Optimum Hyper Polish and Megs UP do contain abrasives, so I wouldn't go that route.