Good luck Chris! I just completed my last Master's course in Space Operations Management from Embry-Riddle Aeronautical University this week! All I have left to do is re-submit my capstone project (Thesis) and I'm all set for my Major's board next year!
If you'll accept some friendly advice, I think you should go towards the focus in the Revolutionary War. You have expressed interest in the subject so it will help you keep your focus on it, especially towards the end when all you want to do is be done with it. Since you have first-hand experience in the modern era, you can always talk to your students about that.