There are seriously so many great jazz players. As far as gypsy jazz is concerned try Django Reinhardt, Stochelo Rosenberg, Jimmy Rosenberg and Robin Nolan. Regular jazz I would say Pat Metheny, Wes Montgomery and Birelli Lagrene(he does regular jazz as well as Gypsy jazz). If you want to venture in to fusion too try Guthrie govan, Steve Gambale and Allan Holdsworth.
Personally I’m mostly a big fan of the gypsy jazz stuff! With fusion and regular jazz I’m kinda picky since a lot of people seem to do like diddly diddly diddly fast stuff all the time where it’s hard to hear a melody(at least for me).