Conducted Emissions of EV Charging Electronics
The first null, of the second/green plot, is at 1.2MHz.

From what I've seen on Spectrum Analyzers (and in Fourier modeling), the first null is at 1/Trise.

So yes ----- If you can slow down the edge, give that a try.

How you chose to DAMPEN the filter may be key. Experiment with parallel or series resistors with the inductor.

===================================

EDIT:

Install a "L" or "T" or "PI" filter, with cutoff at 1MHz (about 0.5uS Trise).

The idea is to weaken the correlation of the "fast edge" with the FFT algorithm inside the R&amp;S boxes.

By converting a perfect RAMP edge into an "ESS" edge, having sort attack and soft delay edges before and after the "rise time", the correlation will be reduced.