CFS TaxTools is based in CA, and their California tax planner is rather good.

I haven't checked to see how/if it's handling this newest CA wrinkle.

@amec 

You can download & use the software as a demo; consider giving it a try.

taxtools.com