This is so much useful information.
Yes, we completed 5 years before filing N400.
I called USCIS earlier today, and explained the scenario, and they suggested if Section 5: Spouse Details can be updated by manually printing a form and signing it and uploading as an additional evidence along with a letter of explanation. However, based on what you described, it might not be needed if both of our cases are treated separately. I plan to call them again tomorrow to ask and validate. Do you think that makes sense?