Hi Dejan,
I understand your point, but I have to say both stages cannot provide enough protection.
It is pretty easy to find a low cap TVS from ST, Nexperia, Infineon,etc. The bandwidth of this design is 100MHz, so any diode with capacitance less than 100pF should work(100ohm+100pF->BW=100MHz).
You didn't see any ESD failure probably because of the series resistors, they can limit the ESD current effectively. But the resistor could be degraded by ESD as well, and it cannot recover, you gonna see the 100ohm becoming first to several tens of ohms, then after more strikes it becomes several thousand of ohms.
More of that, the position of BAV199 cannot help the ESD, that is because the series resistors will have the most voltage drop and residual voltage cannot trigger this diode, and the diode inside the opamp has a much lower trigger voltage, so BAV199 is doing nothing there.
I don't know the ESD performance of AD4817, but usually the opamps are sensitive to ESD events.
I highly recommend that you would change the component, if you plan to have 50ohm input impedance or higher bandwidth, in that case, you can't have so much series resistance to limit the ESD current.