I make my cinnamon rolls about the same way, but I use only butter. No margarine for me. But I've been switching to whole wheat flour, and haven't tried that yet with the rolls. Maybe whole wheat pastry flour might work. When I try this again, I'll start with half whole wheat; maybe even white whole wheat.