Bujinkan Budo Taijutsu for the past 9 years, Wing Chun for 2 before that, and a bit of Tai Chi with Tai Chi sword inbetween.
There was more discipline with Wing Chun because of the emphasis on forms and repetitive drills, not to mention pain! But it was pure fun and I wouldn't give up the skills learnt with the sticky hands drills for anything.
With taijutsu, I've learnt more about flow, going with it and using it, and how to move with the body centred as much as possible, even while walking. The rolling bit's saved my ass a couple of times when I tripped and fell