It's advisable to do as you mentioned- wait until the original return is fully processed (meaning you receive your refund) until you file an amended return. If the return is rejected that would make the fix much easier, but if it is accepted, wait for the refund.
Here is an article you may find useful: How do I amend a California state return in TurboTax Online?
