I'm doing exactly the same thing right now...been fighting it for two weeks now.
Thanks for the tip on cleaning in Safe Mode.
Like I said, it's simply amazing that this hasn't broken in the media. They usually report any new virus long before it gets this far.