I'd pick noma over either of those areas. Wharf is just overpriced tourist bars and restaurants with no true DC culture or vibe. Committing to foggy bottom from the waterfront/wharf is super easy via metro.

You should check out the Mount Vernon Square area (lower Shaw).