Good advice from Simon. I noticed that with the shielding tape also, but didn't address it.
I def concur with Simon about that type of factory p/g shielding. On more recent import p/g's the material is more like a "metallic paper" sticker. IME if it has a flat/matte finish to it, it's generally rubbish and poor conductivity. The shiny "foil-like" material is a bit better, but I use quality copper tape with conductive adhesive, and go right over the factory stuff just because.
It's about 2 minutes more work and costs me about 30 cents worth of tape. Good insurance at that rate.
Also worth noting, when you shield the cavities, be sure and run a little bit up over the edge of the route (at least in a 2-3 places) so there's connectivity between the cavity shield and the p/g shield. (sorry if I telling what you already know)