Butter for the win! I stopped using margarine years ago, even for baking, it's not that much cheaper than butter. I'm in the "butter immediately" camp.
Funny, I was looking at my mom's old recipe box and she had a card for cinnamon sugar that you put on toast. It called for adding some cocoa. I guess that was her secret. I've never tried it.