I just keep two 1000v diodes in stock;
1N4007 for low current inductive sources, eg relays, hydraulic solenoids etc,
1N5408 for higher current inductive sources, eg aircond clutches, starter slave solenoids, etc.
I always fit the diode as close to the source as possible.