Energy shortfall would be overcome in next two years: Expert