Rebonjour Cher Glenn, a few questions please
You have a power electronics lab with SA, LISN, sniffer, H probes ?
Offline SMPS 240/120V input or output filter?
your design is for a DIY, consulting or OEM ? ( one off handmade DIY or for production)
Compliance for conducted EMI, safety?
SMPS topologies, frequency,?
You have any books on EMI compliance and filter design?
Using any magnetics CAD, e.g. Intusoft Magnetics Designer?
Bon courage
Jon