Ok, so after reading tons of posts since the 14th I finally followed the instructions here:
Installing OTA to Rooted Android
Everything went perfect, I have the new bloatware, am still rooted, and everything works as it should. However, when I went to make a backup, I couldn't find nandroid.
Is there any way to add that to the Hboot menu?