Energy Dashboard - Changing Grid Source & Retaining Previous Source Information - Options?

When I originally set up my Energy Dashboard, I configured the Grid Import/Export values off of my Powerwall sensors.

I’ve now got years of data, but I’m actually on a time of use plan, so the calculations never quite added up in this view, despite having the rate dynamically change. A few months after installing my system, I created utility meter sensors to track peak and offpeak for import and export, which those add up to the daily total of import and export.

I’ve now switched the grid import/export values to these other peak/offpeak utility meter sensors, which is accurately breaking down the grid import/export values in the energy dashboard. This change is presenting two clear problems:

  1. Missing Data - I now only have data going back to the date that I created the peak/offpeak sensors, so I’m missing several months of data.

  2. Calculated Costs - it appears to be calculating new costs based on the peak/offpeak sensors correctly, but it does appear to provide this information for data before making the change. It shows the import/export, but not how much it cost.

So before the change, I had all accurate total data with incorrect calculated costs, and now I have partial more granular data with no calculated costs, but moving forward it should be correct.

What options do I have here to make the historical Energy Dashboard accurate?

I’d like to show all of the import/export data I have, but if I add the original combined sensors back, it doubles up my total values for import/export. Is there a way to copy the values from specific dates to the new sensors? Even though I don’t know if it was peak/offpeak, I could live with the historical data being all offpeak or something like that. Or is there a way to limit the dates the dashboard pulls data in from specific sensors?