This paper introduces improvements to the amplitude expansion of the phase-field crystal model that enable the simulation of grains within a full range of orientations. The unphysical grain boundary between grains, rotated by a crystal's symmetry rotation, is removed using a combination of the auxiliary rotation field described in our previous work and an algorithm that correctly matches the complex amplitudes according to the differences in local rotation.