I was under the impression that if you messed with the phone enough, you wouldn't even be able to see the update. What you say may be true. You can unroot to be safe. Truly uninstalling bootstrap is a real pain (its not as easy as just erasing it). Now, I'm the kind of guy that would sbf and then get the update that way to ensure the cleanest update possible. That's what I recommend to you.
CM7GB-601
CM7GB-601