Cost of goods and service by resource type are bundled in consumer (business or residential) price(s) as if to reflect discount scale economies enjoyed by the utility provider.
Electricity is a "energy" commodity (goods). The amount and quality (e.g. timed demand, generator fuel) consumed are subject to variable rates of the utility's cost structure. Consumer rents equipment to terminate delivery (service).
Gas and heating oil are "energy" commodities (goods). The amount and quality (e.g. grade) consumed are subject to variable rates of the utility's cost structure. Consumer rents equipment terminating delivery (NG service); consumer owns equipment terminating delivery (oil, propane, wood, other service). Diversity is the key to economic and political evolution.
I see the argument going either way or, even, both.
(Oh, please not both!)
"Energy" is both. The evidence is all around you. You have only to examine your monthly utility bills (to "discover" the values of variables of the supplier's model). To populate a database of rates, then deduce cost structure of one or more suppliers given prevailing commodity prices (e.g. spot, futures), requires some greater investigatory um rigor. Diversity is the key to economic and political evolution.