Don't worry about gaining mass--lean muscle is your friend, and always will be. Despite some old-school myths, a martial artist can be big, strong, flexiible, AND fast.
SPeaking of JKD, take a look at Bruce Lee. He was a pioneer as far as strength training for martial artists.
Just eat clean, eat lots, and train hard.