Having a resistor (e.g. 1 K range) in the gate line of the FET could also help to reduce the spike with relatively slow OPs. It slows down the signal to the FET but keeps the square signal fast. The 7555 as a schmidt trigger is a good idea.
This actually made things a little worse for my test setup using the LM358.