Mustang:
Without seeing your situation, there are "filler" made by Arlington that can take up the gap between the 'ring and the face of the wallboard. Or, an oversized (goof) blank plate with a 1/2" ko. How is the device mounted now to be NEC compliant??
What are you doing with the number of circuits??? Careful you don't have a 'situation' with what you are doing.
John