My inclination is to say, do neither of these. Instead, take the eye makeup in number 2, tone it down a bit to something less dramatic, and add a subtly colored (but not naked) lip.
That way, you'll look more balanced and polished, but neither lip nor eye will look naked, if that makes sense. Neither one will be shouting, but neither one will be napping.
You'll just look so, so pretty.
ETA: And I would say brown hair, unless your hair is naturally black so that you have a skin tone that goes along with it. Otherwise, brown -- even extremely dark brown -- almost always look softer and less harsh.
