If you want to update to a newer firmware version, you should always pre-patch the AP file and flash it via Odin just like you did before, but this time, you should use the Home CSC and not the CSC file this would preserve the data when doing a firmware update with Odin.