I think Tom is looking for a one step product that will remove some defects and still leave decent protection.
A few that come to mind besides the Meguiar's Color-X he mentioned:
Meguiar's NXT Tech wax. Probably hides more than it removes, but still looks good.
Meguiar's Medallion Premium Paint Protection. This may not be available anymore.
Poorboy's Polish with Carnauba.
I have used all of the above at one time or another. (A whole bunch of others, too,

)
Poorboy's Polish with Sealant. This one I haven't used, but I have heard good things about it.
Charles