It looks like the right move, indeed. I stopped using Google products a while ago, and will probably end up deleting my Gmail account, which is now my de facto junk account for mailing, ads and the like. No need to wait any longer.