I agree with xanthippe. If Baltimore is locked in, consider skipping DC. There is so much in DC I would save it for another trip. Maybe stop for a day in DC and take the tourmobile or walk the Mall? Do the Historical Triangle now to get the most out of that visit!