Black Repertoire for Master

I have two questions which I'll post below.

I'm playing at my local club and am consistantly beating 1800's USCF.

I am wanting to reach master level and I'm wanting to develop a repertoire for black.

What would you recommend if I want to attain Master level? I figure I should start the hard work now before playing certain openings only to switch later. 

I' have been looking into the Najdorf but I'm having trouble with the Bg5 variations and often times hit the middle game and have my eyes go crosseyed.

Please help.

1) What would suggest as openings for black to reach master?

2) And if you suggest the Najdorf... what do you do against Bg5?

P.S. Please don't say i could benefit from studying tactics or endgames. That is part of my study regime... I'm asking about openings.

If the Bg5 Najdorf is too rich for your blood, study up the Keres Attack, and play the Classical Scheveningen (5...e6 instead of 5...a6, and the Classical Scheveningen is 6...a6, which dodges the Bg5-Najdorf, which is useless here because of 6...Be7, but you have to study up on the Keres Attack.  There is a great chapter on this for Black in "Starting Out: The Scheveningen".  The Main line they advocate is the Modern Scheveningen (no a6), but you can use "The Scheveningen: Move By Move" for the main lines and the Starting Out book for the Keres Attack (The Move by Move book might have something good against the Keres, but I can't speak for that one)

There are some lines of overlap between the Classical Scheveningen and the Najdorf, like the English Attack (assuming you are talking e6-Najdorf and not e5-Najdorf).

When I did play the Sicilian, I played the Scheveningen Variation to avoid the 6.Bg5 line myself.  Others play the Najdorf move order to avoid the Keres Attack.  A lot depends on which inconvenient line you want to deal with.  In reality, if you know it (and I mean know it, yes, you must study this line), the Keres Attack isn't "all that" for White like its hype claims.

If you like the najdorf, a similiar sharp opening is the grunfeld. It's very theory heavy, black ends up 3 pawns down in some lines, but it's full equality right now I think. The modern benoni is no bad choice either.

I prefer to play 1... e5 against e4. It's not that sharp, it's not that difficult to outplay weaker players and it is strategically very rich.

Against 1. d4 I'm studying the grunfeld, even though my old modern benoni is not running out of steam yet.

If he has problems with one specific line of the Najdorf, looking to fix that issue, then why are we talking Grunfeld (which is NOT an alternative to the Najdorf as the Grunfeld is a QP Opening) or 1...e5 (Clearly he's not a positional player like you or me)

I use to play the french when I was younger (13) and stronger players in my club played it so I played it. But I now came back to the game 15 years later and realized that he french isn't my style so I had been experimenting with the scandinavian/portugese gambit. But reading about openings it seemed that gambits will have trouble at higher levels.

I don't want to get to 2150 only to have to change my opening repertoire. I'd rather do the hard work now.

I've been tossing around the idea of playing the najdorf, alehkine, pirc/modern against e4 

And was looking at the grunfeld against d4

I don't worry about the english or perenyi in the najdorf as much as Bg5 as almost every variation i have went through in my database (outside poison pawn and Nd7 with fianchetto bishop) black gets in some really hairy position. (I know that is a blanket statement as the najdorf in general is hairy)

I do like your Bg5 variation, @Nearheart, as it does get black in a comfortable position and take the sting out of white. 

Although... a lot of the najdorf variations get crazy and it's hard to know what the plans are as there are so many directions.   

@snowbore that's good to know that you reached master with g6. That's comforting that you don't need to know really heavy theortical lines like the najdorf. 

Given my strength (approx. 1800), my desire to reach master and just coming back to the game, what would one recommend?

Heading deeper into najdorf? Or playing something like Alehkine or modern?