Caraway (I know it in seedy bread) is a gloriously aromatic baking ingredient. I'd go with the Caraway. If you feel the need to, first 'toast' the seeds in a frying pan for a few minutes and then crush to a powder in a pestle and mortar, before adding to the above recipe.