Thanks! Everyone make sure to give rep! Regarding your questions:
1. I think each good faction should have at least one night fighter. I don’t know if you want to make it random, or just assign it to faction heir and/or faction leader. One thing to note: Rhun doesn’t have night fighters either. So if you add them to Dale/Dwarves, you need to add them to Rhun as well.
2. All western dwarven settlements should be turned rebel. I don’t have a problem with them keeping Gimli and/or Thorin if they want.