Your thinking is correct, there is a state refund worksheet that does that math for you and excludes the refund from income automatically....no CA return is needed, thats not income to CA.
