Principled could take care of the fresnel component. But you would lose customization of the fresnel (may or may not be desired) and you would lose the fake caustic effect.
Apologies for the convolution. Complex node networks get tricky quickly.
