I'm not sure what you wrote is right. You shouldn't need to add the non-Calif amount to California. CA starts with the total federal amount then only subtracts the CA exempt amount. I'm in CA too and have Vanguard Mutual Funds with both CA exempt interest and dividends with US Govt obligations.
