More thoughts.

When filtering for RF emissions, make sure the noisy side of the power mains are separated from the shielded side of the power mains. Shielding may include a separate shielded compartment around the line filter and no mixing of the shielded side wires with the noisy side wires to prevent the RF interference from coupling onto the clean side.

To reduce radiated emissions from the system, tie all shielded cable shields to a 360 degree shielding bar before entering the noisy enclosure. Make sure that the longest dimension of the openings in the enclosure are less than 1/10(?) of a wavelength of the highest frequency of concern. Usually that means shielded fan grills and overhanging sheet metal so there is not a line of sight opening between the interior and the exterior of the noisy box.

Here is a good primer on shielding: EMI shielding primer

Good Luck

Larry