Personally I would do einstein and try to maybe have them match your GW scholarship (they are known to match pretty well I believe)-- given that step 1 is now p/f I feel like prestige could start to matter more for matching esp if you're matching back to west coast. Also Einstein's student culture seems better from what I have heard anecdotally from friends