New black Toyota. I have washed, clayed, zaino aio,z5,z2. Under swirl finder there were many type 2 waterspots. My plan is to use pinnacle lotion to remove most of z, use pinnacle swirl remover then pinnacle polish, reapply z2 for durability, top off with souveran. Will z bond over the pinnacle? Is there a better way?