Yup, short of a thorough wet-sand and buff, the claybar, wax and buff is the way to go. I'd get ahold of a power buffer though!