Here is my circuit schematic that includes an inverting OP-AMP, as jdobler suggested, and CLFP value of 5p6F is used for filtering. I have added a 100R series resistor at the output of the op-amp, which also helps for the overshoot problem. 5p6F, 100R and op-amp resistor values are determined after some trail&error. The output waveform is also attached.
DLVAJOE, have you tried lower input levels such as -35 dBm? I have seen some strange behaviour at these levels, such as a non-inverted output waveform from AD8318.