Greg Goyle is one of the characters about whom I worry post war. His particular talents were never going to do him much good post Voldemort. He always loved cakes (that's how Ron & Harry lured him into a cupboard to impersonate him isn't it?) so a bakery is a wonderful place to put him.
I love the role of spy for the resistance which you've given Millicent. It makes perfect sense.
They are both such forceful personalities usually that it was lovely to see them shy with each other. I did enjoy watching them become each other's happy ending.