really glad to hear that! The only thing I can think of thst you might want to do next is backing up your nv data. The following is a copy/past from a post I made a few min ago... root is required to fo this btw, just so you know.
(Since you are looking to update though, I recommend waiting till you have updated before rooting and running this backup)
It's a super simple procedure and will create an on device backup of your nv data. The backup will be stored on a couple of partitions we never touch, not even with firmware flashes. This essentially makes it a permanent backup. The cool thing about it is every time you reboot, the system checks for any corruption, and if detected, it will automatically restore from this backup. So if it were to ever happen, you probably wouldn't ever even notice it!
Install the Terminal Emulator from the play store. Open and enter this:
Thats it! Device will reboot and create your backup. This should prevent you from ever suffering from a lost IMEI!
Two alternatives you can try though, install kies on your computer and update through that. Or there are a couple if threads in the General section that provide the ota for download.
Enewman17 has a few threads helping folks to update so I recommend checking them out as well.
Ive heard that some people have gone to best buy and they were able to initiate the update there. I dont know much more about this though.