Current clamp circuit after buffer amplifier
I don't understand how your circuit is supposed to work; especially the diode makes me frown... it will definitely not limit the current, on the contrary (it limits the voltage and even causes current if the output wants to go higher than 0.7V). 

Anyhow:
The simplest solution is to use an OpAmp that is short circuit resistant by itself.

It is not unlikely that it already is the case (see datasheet).