Good work Greg!
When you shield the cavities, be sure to run the shielding tape out of them and onto the top of the body a wee bit so there is continuity from the pickguard shielding to the cavity shielding. You can do it in just a few places or all the way around the top of the routes.
On the strat below, I ran the tape right under some of the pickguard screw holes (on body and pickguard) so when I put the screw in, it makes a solid contact between the two.