[pjc50]

Those figures will include heating from either source, yes. Non-heating electricity consumption tends to be a tiny fraction of energy use. Centralized "district heating" is pretty rare in the UK.