SgtBatten,
For when you get around to adding a gas meter, thought I’d post my /packages/gas-meter.yaml and /esphome/gas-meter.yaml files up, if they’re of interest.
Based it upon your code above and also some from bits from this good thread https://community.home-assistant.io/t/using-home-assistant-to-calculate-my-energy-bill-using-data-from-my-solar-inverter/344913/1.
Next to go back and add TOU plus Demand tariff rates to my electricity, using Solar Analytics for the import/export/production sensors (toss up between Huawei inverters or IoTaWatt also) and then add add water meter with 0-800L (average) per day tarrif tier and 801L-??? tariff tiers.
See: https://github.com/Roving-Ronin/Home-Assistant
BTW would you know why every screenshot of Energy Dash has kWh Import cost is a positive $ (like we are paid to use kWh), whilst Export is a negative (like we are paying to export)?