Just called PGE to switch from E6 + Smart Rate to EVA. I didn't see EVA as a option when comparing your estimated usage until today, but it seems to make a lot of sense for me due to my 100 mile daily commute and no solar (yet).
As an aside, I just went from E1 to E6 just this past December...