Haha okay, well maybe SBF'ing would be the best option, just to make sure that EVERYTHING is back to stock like you said. I read somewhere that you can run an update.zip that does the same thing as an SBF, and it saves the time of having to do all of those steps. Check out this link and let me know what you think:
maderstcok - OTA 2.3.340 update.zip
Like I said, I'm a noob at a lot of this. Seems that there is definitely more than one way to skin the cat.
Thanks agian bro