Actually, those with battery storage do also qualify for EV2-A on a pilot basis. I haven't heard that they've exhausted the 30,000 battery-only slots, so I suspect you could change to that if you wanted to. See https://www.pge.com/tariffs/assets/pdf/tariffbook/ELEC_SCHEDS_EV2%20(Sch).pdf
I...