You are correct - send the 1040-X and the 8606 to federal. For California, there probably will not be any changes, as you appear to be just generating the 8606 (which is required for the federal return). If this is the case, you do not need to mail anything to California.
