Yup!
I did the canopy fit with the 821 clecoed on as well - no problems at all. My windshield fit to the 821 was as good as I've seen in most folks pictures. After rivetting the 821, I "glued" on the windshield with an epoxy resin/flox paste dyed black with gelcoat pigment, so that I wouldn't see an off-color line from the cockpit - worked great!
Paul Dye