Whisk the flour, cornmeal, ¼ cup of sugar, baking powder, soda and salt in a large bowl to combine. Whisk the melted butter, buttermilk, and vanilla together in a small bowl. Mix the remaining 2 tsps sugar and cinnamon in a second small bowl and set aside. One minute before the berries come out of the oven, add the wet to dry ingredients; stir with a rubber spatula until just combined and no dry pockets remain.