Right, I'm struggling with a dilemma. I can't decide how I'd like to develop Q with regards to his combat capabilities.  

Either I can 1.) Have him realize his shortcomings and resolve to become a better martial artist, more in line with the Vic Sage version of the Question.  If this was the case he would conceivably need a teacher, preferably picking one of our characters to train him, Mr Miyagi style.  

Or 2.) Give him a more occult slant.  He could pick up some petty mysticism and magic powers, all self taught.  He would then function as more of a trickster on the battlefield, using illusions and basic spells to misdirect and debuff his enemies.  

What d'yall think?