I would add Johns Hopkins to your list of undergrad programs. Their masters program (SAIS in DC) is currently 2nd in the country and they offer a unique 3/2 masters program for students who can handle the rigor. Daughter has been having an amazing experience in the undergrad program.