Would a zener diode with a reverse breakdown voltage of 5V across the power supply help too?

Maybe this is solution is a bit too simple, but since you already have good regulation provided by the 7806, it might work. Zener diodes are quite effective in clamping transient overvoltages.

kundi