Risk of load-shedding 'will gradually decrease after April'