Aw, that could work nicely. You know what would be really cute, but totally impractical? An Avox. I can't picture Peeta living with someone who can't talk though. I like the thought of her/him helping Peeta escape and they run away to 13 though <3 Maybe we won't have to say "Poor Peeta" so much after all. 

My first thought for the first major conflict after the overthrow is reconstruction but that's a lonnnnng way away.