So I spent some time with Google (not the built in search on this site), and found the following, on this site from last year...
https://ttlc.intuit.com/community/state-taxes/discussion/if-you-have-two-ca-entries-in-box-15-to-19-...
It addresses my exact problem and so I went with their solution. TurboTax let me e-file it just now. We'll see if it's accepted by the state.
