OPA2355 Overshoot


I have designed a TIA amplifier using OPA2355, the circuit works well, however there is one problem I need to address.

I get an input signal that is 1MHz, the transmitter turns on and off every 500nsec. However the transmit power of the transmitter is not coherent or linear. In one cycle it can be as high as 500mV swing (at the second stage output) and in the next cycle it can be 50mV. I get an overshoot if the weak signal is preceded by a strong signal. This is something I can deal in software but it has a high power tax, so I like to ask the gurus what are the changes I can make to to alleviate this problem or eliminate altogether. 

My schematic is at the top.