I have been combating EMI from a motor switched by a relay but have managed to get it under control or so I think:
It started like this: 30+ voltage swing @ 5.000us+

After an AC snubber, opto-couplers, decoupling caps it's now: 2.5 volt swing @ 200ns

It's all connected to a Arduino (5V) and various other components (LCD, LEDs, shift registers, etc))
So I'm trying to figure out if I have suppressed it enough so it won't effect the other components. I can't seem to find any best practices around, that say keep voltage spikes to X percent over X duration. Is there any guidelines like that I can follow? Is a 2-3 V spike over 200ns acceptable in this situation?
Circuit diagram for clarity:

Thanks