If you have any good JKD/Fillipino schools in your area check them out. It is full of nasty tricks and is just as relentless as Muay Thai. I say this because if you aren't doing mma, you don't have to worry about training illegal moves.
JKD and the Fillipino arts blend seemlessly with Jitsu/Judo. Kicking striking trapping grappling, all ranges covered. A good JKD instructor is probably going to have plenty of years experience in jujitsu, boxing and kickboxing.
Look for people who trained with Dan Inosanto, Larry Hartsell, and Paul Vunak, or one of their top students. Larry Hartsell(rest in peace) especially developed great dynamic entries for throws and takedowns thanks to his jitsu/judo base.