My previous car was a 116d, and I haven't looked back since. It sounds like we are in similar situation to yourself, small family with one car so it needs to cover all bases.
The Golf is a much better package & very comfortable. We got luckly and found a DCC GTI, in comfort it is much more compliant compared to the old 1 series in Msport trim(along with the msport suspension), in sport its as you would expect "sporty" bumpy ride. However it sounds like non DCC is also great, I suspect it would still be better than a 1 series with run-flats and (if you have it) the harsh msport suspension.
While we are talking about tyres, going non runflat is sooo much cheaper. I would usually spend £600+ for all four corners on the bmw with 18 inch tyres. Recently put Michellin PS4's in the same 18 inch size on all four corners for £380 - bargain in comparison.