I recommend portioning the dough before freezing, because this allows you to bake individual cookies straight from the freezer. Adding 1-2 extra minutes of baking time is usually enough to bake frozen dough.