A little update for anybody interested: I've been talking to the PG&E person I've been working with on the new service for my property. He's assured me that as long as my new service application states that I intend to install solar, I don't even need to have the net metering agreement application submitted by 4/15. I hope that's right because the way it's going, I won't have service by then. My application was submitted almost a year ago and they continue to change the "energize" date. The "new generation" app (i.e. "net metering" application) requires a PG&E account number and meter number, neither of which I'll have until I actually have service.
One thing I did note that could be a problem for anybody hoping to figure out the specifics of your system after you submit the application is that you can only make a max 10% capacity change without being forced to "re-apply", which essentially means you'd be forced into NEM3 if you did so after 4/15.