Re-evaluation of future water stress due to socio-economic and climate factors under a warming climate