Z got a wash, clay, and wax this afternoon. I even attacked some scratches by hand after the clay bar - they didn't come out completely but definitely look better. I think I can get them out completely with proper materials. I only used a polishing pad and Meguiar's Ultimate Compound, so I will use a compound pad and the rubbing compound first next time before following up with the polishing compound using a polishing pad (maybe borrow a friend's random orbital, too).