This kind of thing made iCloud advanced protection more compelling. Their services are becoming so complex that they don’t have tests for all these edge cases. This sucks about copying over the billing info but at least if you enable advanced protection, it’s not your photos or notes!