After doing some more spot fill and prime, we finally got down to a final scuff and wipe before paint.