Gwadar water crisis set to end next year