I would say that Conner probably retained his memory before the Cat Leap into World 30, and didn't lose his ship...
...but if he didn't, then he wouldn't have been able to get the Zero to Sun Jewel so quickly, so time wouldn't align properly...
Huh, well this is a bit interesting now.