Wow I really cant believe that there are still people out there complaining about the data issue when the fix has been out there for 2-3 weeks now!!! Like I've said in a few other threads, if you have the issues and have not applied the updates that are available, then either do it or stop complaining.
The fact that you're so scared about voiding you warranty just shows how ignorant you are of these processes. I've flashed custom roms, leaked updates, etc... so many times I could probably do it with my eyes closed. You know what?? I have NEVER gotten to a point where I couldn't return to 100% stock. The only time you have to worry about "voiding" your warranty is if YOU are stupid enough to return a phone for a warranty replacement still modded/rooted.
99.9% of the threads that you see that have titles something like "Oh no I bricked my phone" are just people that haven't learned how to recover properly yet and will most likely have their issues addressed and fixed within the first ten posts.