Check out Hilight Tribe. Really cool crew that creates organic trance mostly on acoustic instruments. Killer live show. If you've been lucky enough to catch them at Boom in past years, you know what I mean.
If you're getting into jazzy/improvisational flamenco guitar, definitely check out Paco De Lucia, John McLaughlin, and Al Di Meola (in that order, Paco for pure classic, John for trippy fusion, Al for tacky but technically impressive fusion). The three of them have performed and recorded together. Look for the famous album titled "Friday Night in San Francisco" for the seminal live performance of them together. I've seen them all live before. MASTERS of their art.
Here's a clip of a song they've immortalized (Mediterranean Sundance):
If you want to go deeper into psychedelic jazz, start going through the Miles Davis library, particularly his late 60s fusion years. Start with Bitches Brew, move on to Agartha, then Pangea, Dark Magus, and Black Beauty. I love all his old stuff also, just mentioning these as they're the most psychedelic (some heavy/dark stuff here though).
Classic track from Agartha:
**EDIT:
Also, if you're into what's up in the SF Bay area nowadays, check out Beats Antique for the psychedelic, hipster, gypsy flavor (they're mostly acoustic/electric but they go all the way into electro glitch at times):
Another SF Bay area artist of current note is Random Rab. Again, acoustic/electric but some electronic fusion. Very worth checking out regardless (more mellow, mind/soul music):
(Both amazing acts to catch live, they hit the festival circuit in the States all summer, you can't miss them really.)