I may be reading something wrong, but if your overproduction is likely to continue I’d suggest heat pumps and a heat pump water heater. You’ll displace at least some of your oil cost with your electric credit.