JHU for international affairs for sure due to SAIS. I think the undergraduate experience at JHU iis MUCH better all around than Berkeley. JHU downside is the location. Berkeley is the picture perfect college town. As to law school as admission, it will make no difference per Se. Go where you can do your best work. Berkeley has huge resource issues, housing, oversubscribed classes making it tough to graduate in four years, and a politically off the charts left wing vibe.
And congratulations ! You are lucky to have two superlative choices.