I would say go with the X/Y capacitors and pick ones that have the highest AC and DC voltages you can find which will fit physically. Be aware of any special local and national electric codes for equipment where you live and try to comply with the latest standards where you can. There is more to snubber applications than one might think at first. The encapsulation materials used are important from the aspect of fire and smoke hazards. The same is true for AC power switch assemblies in electronic equipment. Older models may have materials that do not meet more modern standards, but of course many of them are unique to a given product at the time of manufacture. Some go the route of using power strips that can turn units on and off externally to extend the life of the internal OEM switches.
Joe
Joseph Strickland