Ok sir. Fine. That was an error from my side when I switched from one set of terminologies to the other. I understood this completely. And the modified Jurin's law is as per my initial expectation, independent of $S$:
$$h=\frac{2(\gamma_{sa}-\gamma_{ls})}{r\rho g}$$
and has the cohesive and adhesive terms hidden inside the surface tension terms.