Actually, assuming you talk to Emmie about Buddy and free Birdie at the same time, all you need to do to avoid having to fight the dogs on subsequent visits to the fort is close the door after you when you leave. I could hear Emmie lamenting how much she missed Buddy through the wall while investigating the Flenser's Playground next door, despite having left and returned to the fort several times to turn in quests.