backup up your stuff, use PC odin to flash, it is best to start fresh, so I would recommend you do a wipe, I was running on the latest leak and was rooted so I used mobile odin pro, so if you are rooted this is the best way to go as mobile odin uses a safe temporary kernel to wipe just in case so you don't brick your device.
2nd use let mobile odin pro use the unzipped file as it is ? or i need to rename it or . .?