The Generalized Method of Moments (GMM) is a partition of unity based technique for solving electromagnetic and acoustic boundary integral equations. Past work on the GMM for electromagnetics was confined to geometries modeled by piecewise flat tessellations and suffered from spurious internal line charges. In the present article, we redesign the GMM scheme and demonstrate its ability to model scattering from PEC scatterers composed of mixtures of smooth and non-smooth geometrical features. Furthermore, we demonstrate that because the partition of unity provides function and effective geometrical continuity between patches, the GMM permits mixtures of local geometry descriptions and approximation function spaces with significantly more freedom than traditional moment methods.