Thanks on your report. Was thinking about it more in the mean time, and I think I will go for Canon 35mm f2 IS, since I'd be using Sigma at 35mm the most anyway.
With Canon 35mm f2 IS I get - full Canon AF compatibility, both on Crop and FF and great IS.
On Sigma I'd get more range, 1/3 brighter lens and slightly sharper images. But much heavier, more expensive, no IS, no FF compatibility, with a hope that AF will be always accurate.