Buck converter load disconnection
You could provide a RC snubber circuit parallel to the diode (google for “RC snubber DCDC”) 
This slows down the sharp edges of the switching waveform and of course reduces efficiency a bit. This is often done to reduce EMI problems, and it might also help reducing the harmful voltage spikes.